Autogenerated HTML docs for v1.7.4
diff --git a/RelNotes/1.7.4.txt b/RelNotes/1.7.4.txt index 87a60fe..d5bca73 100644 --- a/RelNotes/1.7.4.txt +++ b/RelNotes/1.7.4.txt
@@ -1,5 +1,5 @@ -Git v1.7.4 Release Notes (draft) -================================ +Git v1.7.4 Release Notes +======================== Updates since v1.7.3 -------------------- @@ -146,6 +146,9 @@ * "git push --progress" shows progress indicators now. + * "git rebase -i" showed a confusing error message when given a + branch name that does not exist. + * "git repack" places its temporary packs under $GIT_OBJECT_DIRECTORY/pack instead of $GIT_OBJECT_DIRECTORY/ to avoid cross directory renames.
diff --git a/git-annotate.html b/git-annotate.html index cfc9682..8326309 100644 --- a/git-annotate.html +++ b/git-annotate.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-annotate(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-annotate(1)</title> </head> <body> <div id="header"> @@ -318,23 +412,23 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git annotate</em> [options] file [revision]</p></div> +<div class="paragraph"><p><em>git annotate</em> [options] file [revision]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Annotates each line in the given file with information from the commit +<div class="paragraph"><p>Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision.</p></div> -<div class="para"><p>The only difference between this command and <a href="git-blame.html">git-blame(1)</a> is that +<div class="paragraph"><p>The only difference between this command and <a href="git-blame.html">git-blame(1)</a> is that they use slightly different output formats, and this command exists only for backward compatibility to support existing scripts, and provide a more familiar command name for people coming from other SCM systems.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -b </dt> <dd> @@ -343,7 +437,7 @@ be controlled via the <tt>blame.blankboundary</tt> config option. </p> </dd> -<dt> +<dt class="hdlist1"> --root </dt> <dd> @@ -352,7 +446,7 @@ controlled via the <tt>blame.showroot</tt> config option. </p> </dd> -<dt> +<dt class="hdlist1"> --show-stats </dt> <dd> @@ -360,7 +454,7 @@ Include additional statistics at the end of blame output. </p> </dd> -<dt> +<dt class="hdlist1"> -L <start>,<end> </dt> <dd> @@ -368,19 +462,19 @@ Annotate only the given line range. <start> and <end> can take one of these forms: </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> number </p> -<div class="para"><p>If <start> or <end> is a number, it specifies an +<div class="paragraph"><p>If <start> or <end> is a number, it specifies an absolute line number (lines count from 1).</p></div> </li> <li> <p> /regex/ </p> -<div class="para"><p>This form will use the first line matching the given +<div class="paragraph"><p>This form will use the first line matching the given POSIX regex. If <end> is a regex, it will search starting at the line given by <start>.</p></div> </li> @@ -388,12 +482,12 @@ <p> +offset or -offset </p> -<div class="para"><p>This is only valid for <end> and will specify a number +<div class="paragraph"><p>This is only valid for <end> and will specify a number of lines before or after the line given by <start>.</p></div> </li> </ul></div> </dd> -<dt> +<dt class="hdlist1"> -l </dt> <dd> @@ -401,7 +495,7 @@ Show long rev (Default: off). </p> </dd> -<dt> +<dt class="hdlist1"> -t </dt> <dd> @@ -409,7 +503,7 @@ Show raw timestamp (Default: off). </p> </dd> -<dt> +<dt class="hdlist1"> -S <revs-file> </dt> <dd> @@ -417,7 +511,7 @@ Use revisions from revs-file instead of calling <a href="git-rev-list.html">git-rev-list(1)</a>. </p> </dd> -<dt> +<dt class="hdlist1"> --reverse </dt> <dd> @@ -429,10 +523,10 @@ START. </p> </dd> -<dt> +<dt class="hdlist1"> -p </dt> -<dt> +<dt class="hdlist1"> --porcelain </dt> <dd> @@ -440,7 +534,7 @@ Show in a format designed for machine consumption. </p> </dd> -<dt> +<dt class="hdlist1"> --incremental </dt> <dd> @@ -449,7 +543,7 @@ machine consumption. </p> </dd> -<dt> +<dt class="hdlist1"> --encoding=<encoding> </dt> <dd> @@ -461,7 +555,7 @@ manual page. </p> </dd> -<dt> +<dt class="hdlist1"> --contents <file> </dt> <dd> @@ -473,7 +567,7 @@ <tt>-</tt> to make the command read from the standard input). </p> </dd> -<dt> +<dt class="hdlist1"> --date <format> </dt> <dd> @@ -486,7 +580,7 @@ of the --date option at <a href="git-log.html">git-log(1)</a>. </p> </dd> -<dt> +<dt class="hdlist1"> -M|<num>| </dt> <dd> @@ -501,12 +595,12 @@ option, both groups of lines are blamed on the parent by running extra passes of inspection. </p> -<div class="para"><p><num> is optional but it is the lower bound on the number of +<div class="paragraph"><p><num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20.</p></div> </dd> -<dt> +<dt class="hdlist1"> -C|<num>| </dt> <dd> @@ -520,17 +614,17 @@ option is given three times, the command additionally looks for copies from other files in any commit. </p> -<div class="para"><p><num> is optional but it is the lower bound on the number of +<div class="paragraph"><p><num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one <tt>-C</tt> options given, the <num> argument of the last <tt>-C</tt> will take effect.</p></div> </dd> -<dt> +<dt class="hdlist1"> -h </dt> -<dt> +<dt class="hdlist1"> --help </dt> <dd> @@ -542,19 +636,19 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-blame.html">git-blame(1)</a></p></div> +<div class="paragraph"><p><a href="git-blame.html">git-blame(1)</a></p></div> </div> <h2 id="_author">AUTHOR</h2> <div class="sectionbody"> -<div class="para"><p>Written by Ryan Anderson <ryan@michonline.com>.</p></div> +<div class="paragraph"><p>Written by Ryan Anderson <<a href="mailto:ryan@michonline.com">ryan@michonline.com</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:33 UTC +Last updated 2009-03-03 08:28:29 UTC </div> </div> </body> diff --git a/git-bisect-lk2009.html b/git-bisect-lk2009.html index 9fcc46b..1cd5483 100644 --- a/git-bisect-lk2009.html +++ b/git-bisect-lk2009.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>Fighting regressions with git bisect</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,18 +381,17 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>Fighting regressions with git bisect</title> </head> <body> <div id="header"> <h1>Fighting regressions with git bisect</h1> <span id="author">Christian Couder</span><br /> <span id="email"><tt><<a href="mailto:chriscool@tuxfamily.org">chriscool@tuxfamily.org</a>></tt></span><br /> -2009/11/08 +<span id="revdate">2009/11/08</span> </div> <h2 id="_abstract">Abstract</h2> <div class="sectionbody"> -<div class="para"><p>"git bisect" enables software users and developers to easily find the +<div class="paragraph"><p>"git bisect" enables software users and developers to easily find the commit that introduced a regression. We show why it is important to have good tools to fight regressions. We describe how "git bisect" works from the outside and the algorithms it uses inside. Then we @@ -324,42 +401,42 @@ </div> <h2 id="_introduction_to_git_bisect">Introduction to "git bisect"</h2> <div class="sectionbody"> -<div class="para"><p>Git is a Distributed Version Control system (DVCS) created by Linus +<div class="paragraph"><p>Git is a Distributed Version Control system (DVCS) created by Linus Torvalds and maintained by Junio Hamano.</p></div> -<div class="para"><p>In Git like in many other Version Control Systems (VCS), the different +<div class="paragraph"><p>In Git like in many other Version Control Systems (VCS), the different states of the data that is managed by the system are called commits. And, as VCS are mostly used to manage software source code, sometimes "interesting" changes of behavior in the software are introduced in some commits.</p></div> -<div class="para"><p>In fact people are specially interested in commits that introduce a +<div class="paragraph"><p>In fact people are specially interested in commits that introduce a "bad" behavior, called a bug or a regression. They are interested in these commits because a commit (hopefully) contains a very small set -of source code changes. And it's much easier to understand and +of source code changes. And it’s much easier to understand and properly fix a problem when you only need to check a very small set of -changes, than when you don't know where look in the first place.</p></div> -<div class="para"><p>So to help people find commits that introduce a "bad" behavior, the +changes, than when you don’t know where look in the first place.</p></div> +<div class="paragraph"><p>So to help people find commits that introduce a "bad" behavior, the "git bisect" set of commands was invented. And it follows of course that in "git bisect" parlance, commits where the "interesting behavior" is present are called "bad" commits, while other commits are called "good" commits. And a commit that introduce the behavior we are interested in is called a "first bad commit". Note that there could be more than one "first bad commit" in the commit space we are searching.</p></div> -<div class="para"><p>So "git bisect" is designed to help find a "first bad commit". And to +<div class="paragraph"><p>So "git bisect" is designed to help find a "first bad commit". And to be as efficient as possible, it tries to perform a binary search.</p></div> </div> <h2 id="_fighting_regressions_overview">Fighting regressions overview</h2> <div class="sectionbody"> <h3 id="_regressions_a_big_problem">Regressions: a big problem</h3><div style="clear:left"></div> -<div class="para"><p>Regressions are a big problem in the software industry. But it's +<div class="paragraph"><p>Regressions are a big problem in the software industry. But it’s difficult to put some real numbers behind that claim.</p></div> -<div class="para"><p>There are some numbers about bugs in general, like a NIST study in +<div class="paragraph"><p>There are some numbers about bugs in general, like a NIST study in 2002 <a href="#1">[1]</a> that said:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>Software bugs, or errors, are so prevalent and so detrimental that +<div class="paragraph"><p>Software bugs, or errors, are so prevalent and so detrimental that they cost the U.S. economy an estimated $59.5 billion annually, or about 0.6 percent of the gross domestic product, according to a newly -released study commissioned by the Department of Commerce's National +released study commissioned by the Department of Commerce’s National Institute of Standards and Technology (NIST). At the national level, over half of the costs are borne by software users and the remainder by software developers/vendors. The study also found that, although @@ -371,82 +448,87 @@ to the development stages in which they are introduced. Currently, over half of all errors are not found until "downstream" in the development process or during post-sale software use.</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>And then:</p></div> +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>And then:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>Software developers already spend approximately 80 percent of +<div class="paragraph"><p>Software developers already spend approximately 80 percent of development costs on identifying and correcting defects, and yet few products of any type other than software are shipped with such high levels of errors.</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>Eventually the conclusion started with:</p></div> +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>Eventually the conclusion started with:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>The path to higher software quality is significantly improved software +<div class="paragraph"><p>The path to higher software quality is significantly improved software testing.</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>There are other estimates saying that 80% of the cost related to +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>There are other estimates saying that 80% of the cost related to software is about maintenance <a href="#2">[2]</a>.</p></div> -<div class="para"><p>Though, according to Wikipedia <a href="#3">[3]</a>:</p></div> +<div class="paragraph"><p>Though, according to Wikipedia <a href="#3">[3]</a>:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>A common perception of maintenance is that it is merely fixing +<div class="paragraph"><p>A common perception of maintenance is that it is merely fixing bugs. However, studies and surveys over the years have indicated that the majority, over 80%, of the maintenance effort is used for non-corrective actions (Pigosky 1997). This perception is perpetuated by users submitting problem reports that in reality are functionality enhancements to the system.</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>But we can guess that improving on existing software is very costly +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>But we can guess that improving on existing software is very costly because you have to watch out for regressions. At least this would make the above studies consistent among themselves.</p></div> -<div class="para"><p>Of course some kind of software is developed, then used during some +<div class="paragraph"><p>Of course some kind of software is developed, then used during some time without being improved on much, and then finally thrown away. In this case, of course, regressions may not be a big problem. But on the other hand, there is a lot of big software that is continually developed and maintained during years or even tens of years by a lot of people. And as there are often many people who depend (sometimes critically) on such software, regressions are a really big problem.</p></div> -<div class="para"><p>One such software is the linux kernel. And if we look at the linux +<div class="paragraph"><p>One such software is the linux kernel. And if we look at the linux kernel, we can see that a lot of time and effort is spent to fight regressions. The release cycle start with a 2 weeks long merge window. Then the first release candidate (rc) version is tagged. And after that about 7 or 8 more rc versions will appear with around one week between each of them, before the final release.</p></div> -<div class="para"><p>The time between the first rc release and the final release is +<div class="paragraph"><p>The time between the first rc release and the final release is supposed to be used to test rc versions and fight bugs and especially regressions. And this time is more than 80% of the release cycle time. But this is not the end of the fight yet, as of course it continues after the release.</p></div> -<div class="para"><p>And then this is what Ingo Molnar (a well known linux kernel +<div class="paragraph"><p>And then this is what Ingo Molnar (a well known linux kernel developer) says about his use of git bisect:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>I most actively use it during the merge window (when a lot of trees +<div class="paragraph"><p>I most actively use it during the merge window (when a lot of trees get merged upstream and when the influx of bugs is the highest) - and yes, there have been cases that i used it multiple times a day. My average is roughly once a day.</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>So regressions are fought all the time by developers, and indeed it is +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>So regressions are fought all the time by developers, and indeed it is well known that bugs should be fixed as soon as possible, so as soon -as they are found. That's why it is interesting to have good tools for +as they are found. That’s why it is interesting to have good tools for this purpose.</p></div> <h3 id="_other_tools_to_fight_regressions">Other tools to fight regressions</h3><div style="clear:left"></div> -<div class="para"><p>So what are the tools used to fight regressions? They are nearly the +<div class="paragraph"><p>So what are the tools used to fight regressions? They are nearly the same as those used to fight regular bugs. The only specific tools are test suites and tools similar as "git bisect".</p></div> -<div class="para"><p>Test suites are very nice. But when they are used alone, they are +<div class="paragraph"><p>Test suites are very nice. But when they are used alone, they are supposed to be used so that all the tests are checked after each commit. This means that they are not very efficient, because many tests are run for no interesting result, and they suffer from combinational explosion.</p></div> -<div class="para"><p>In fact the problem is that big software often has many different +<div class="paragraph"><p>In fact the problem is that big software often has many different configuration options and that each test case should pass for each configuration after each commit. So if you have for each release: N configurations, M commits and T test cases, you should perform:</p></div> @@ -454,9 +536,9 @@ <div class="content"> <pre><tt>N * M * T tests</tt></pre> </div></div> -<div class="para"><p>where N, M and T are all growing with the size your software.</p></div> -<div class="para"><p>So very soon it will not be possible to completely test everything.</p></div> -<div class="para"><p>And if some bugs slip through your test suite, then you can add a test +<div class="paragraph"><p>where N, M and T are all growing with the size your software.</p></div> +<div class="paragraph"><p>So very soon it will not be possible to completely test everything.</p></div> +<div class="paragraph"><p>And if some bugs slip through your test suite, then you can add a test to your test suite. But if you want to use your new improved test suite to find where the bug slipped in, then you will either have to emulate a bisection process or you will perhaps bluntly test each @@ -466,7 +548,7 @@ <h2 id="_git_bisect_overview">"git bisect" overview</h2> <div class="sectionbody"> <h3 id="_starting_a_bisection">Starting a bisection</h3><div style="clear:left"></div> -<div class="para"><p>The first "git bisect" subcommand to use is "git bisect start" to +<div class="paragraph"><p>The first "git bisect" subcommand to use is "git bisect start" to start the search. Then bounds must be set to limit the commit space. This is done usually by giving one "bad" and at least one "good" commit. They can be passed in the initial call to "git bisect @@ -475,19 +557,19 @@ <div class="content"> <pre><tt>$ git bisect start [BAD [GOOD...]]</tt></pre> </div></div> -<div class="para"><p>or they can be set using:</p></div> +<div class="paragraph"><p>or they can be set using:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect bad [COMMIT]</tt></pre> </div></div> -<div class="para"><p>and:</p></div> +<div class="paragraph"><p>and:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect good [COMMIT...]</tt></pre> </div></div> -<div class="para"><p>where BAD, GOOD and COMMIT are all names that can be resolved to a +<div class="paragraph"><p>where BAD, GOOD and COMMIT are all names that can be resolved to a commit.</p></div> -<div class="para"><p>Then "git bisect" will checkout a commit of its choosing and ask the +<div class="paragraph"><p>Then "git bisect" will checkout a commit of its choosing and ask the user to test it, like this:</p></div> <div class="listingblock"> <div class="content"> @@ -495,17 +577,17 @@ Bisecting: 10928 revisions left to test after this (roughly 14 steps) [2ec65f8b89ea003c27ff7723525a2ee335a2b393] x86: clean up using max_low_pfn on 32-bit</tt></pre> </div></div> -<div class="para"><p>Note that the example that we will use is really a toy example, we +<div class="paragraph"><p>Note that the example that we will use is really a toy example, we will be looking for the first commit that has a version like "2.6.26-something", that is the commit that has a "SUBLEVEL = 26" line in the top level Makefile. This is a toy example because there are better ways to find this commit with git than using "git bisect" (for example "git blame" or "git log -S<string>").</p></div> <h3 id="_driving_a_bisection_manually">Driving a bisection manually</h3><div style="clear:left"></div> -<div class="para"><p>At this point there are basically 2 ways to drive the search. It can +<div class="paragraph"><p>At this point there are basically 2 ways to drive the search. It can be driven manually by the user or it can be driven automatically by a script or a command.</p></div> -<div class="para"><p>If the user is driving it, then at each step of the search, the user +<div class="paragraph"><p>If the user is driving it, then at each step of the search, the user will have to test the current commit and say if it is "good" or "bad" using the "git bisect good" or "git bisect bad" commands respectively that have been described above. For example:</p></div> @@ -515,7 +597,7 @@ Bisecting: 5480 revisions left to test after this (roughly 13 steps) [66c0b394f08fd89236515c1c84485ea712a157be] KVM: kill file->f_count abuse in kvm</tt></pre> </div></div> -<div class="para"><p>And after a few more steps like that, "git bisect" will eventually +<div class="paragraph"><p>And after a few more steps like that, "git bisect" will eventually find a first bad commit:</p></div> <div class="listingblock"> <div class="content"> @@ -529,7 +611,7 @@ :100644 100644 5cf8258195331a4dbdddff08b8d68642638eea57 4492984efc09ab72ff6219a7bc21fb6a957c4cd5 M Makefile</tt></pre> </div></div> -<div class="para"><p>At this point we can see what the commit does, check it out (if it's +<div class="paragraph"><p>At this point we can see what the commit does, check it out (if it’s not already checked out) or tinker with it, for example:</p></div> <div class="listingblock"> <div class="content"> @@ -555,7 +637,7 @@ # *DOCUMENTATION*</tt></pre> </div></div> -<div class="para"><p>And when we are finished we can use "git bisect reset" to go back to +<div class="paragraph"><p>And when we are finished we can use "git bisect reset" to go back to the branch we were in before we started bisecting:</p></div> <div class="listingblock"> <div class="content"> @@ -565,7 +647,7 @@ Switched to branch 'master'</tt></pre> </div></div> <h3 id="_driving_a_bisection_automatically">Driving a bisection automatically</h3><div style="clear:left"></div> -<div class="para"><p>The other way to drive the bisection process is to tell "git bisect" +<div class="paragraph"><p>The other way to drive the bisection process is to tell "git bisect" to launch a script or command at each bisection step to know if the current commit is "good" or "bad". To do that, we use the "git bisect run" command. For example:</p></div> @@ -599,37 +681,37 @@ :100644 100644 5cf8258195331a4dbdddff08b8d68642638eea57 4492984efc09ab72ff6219a7bc21fb6a957c4cd5 M Makefile bisect run success</tt></pre> </div></div> -<div class="para"><p>In this example, we passed "grep <em>^SUBLEVEL = 25</em> Makefile" as +<div class="paragraph"><p>In this example, we passed "grep <em>^SUBLEVEL = 25</em> Makefile" as parameter to "git bisect run". This means that at each step, the grep command we passed will be launched. And if it exits with code 0 (that means success) then git bisect will mark the current state as "good". If it exits with code 1 (or any code between 1 and 127 included, except the special code 125), then the current state will be marked as "bad".</p></div> -<div class="para"><p>Exit code between 128 and 255 are special to "git bisect run". They +<div class="paragraph"><p>Exit code between 128 and 255 are special to "git bisect run". They make it stop immediately the bisection process. This is useful for example if the command passed takes too long to complete, because you can kill it with a signal and it will stop the bisection process.</p></div> -<div class="para"><p>It can also be useful in scripts passed to "git bisect run" to "exit +<div class="paragraph"><p>It can also be useful in scripts passed to "git bisect run" to "exit 255" if some very abnormal situation is detected.</p></div> <h3 id="_avoiding_untestable_commits">Avoiding untestable commits</h3><div style="clear:left"></div> -<div class="para"><p>Sometimes it happens that the current state cannot be tested, for +<div class="paragraph"><p>Sometimes it happens that the current state cannot be tested, for example if it does not compile because there was a bug preventing it at that time. This is what the special exit code 125 is for. It tells "git bisect run" that the current commit should be marked as untestable and that another one should be chosen and checked out.</p></div> -<div class="para"><p>If the bisection process is driven manually, you can use "git bisect +<div class="paragraph"><p>If the bisection process is driven manually, you can use "git bisect skip" to do the same thing. (In fact the special exit code 125 makes "git bisect run" use "git bisect skip" in the background.)</p></div> -<div class="para"><p>Or if you want more control, you can inspect the current state using +<div class="paragraph"><p>Or if you want more control, you can inspect the current state using for example "git bisect visualize". It will launch gitk (or "git log" if the DISPLAY environment variable is not set) to help you find a better bisection point.</p></div> -<div class="para"><p>Either way, if you have a string of untestable commits, it might +<div class="paragraph"><p>Either way, if you have a string of untestable commits, it might happen that the regression you are looking for has been introduced by -one of these untestable commits. In this case it's not possible to +one of these untestable commits. In this case it’s not possible to tell for sure which commit introduced the regression.</p></div> -<div class="para"><p>So if you used "git bisect skip" (or the run script exited with +<div class="paragraph"><p>So if you used "git bisect skip" (or the run script exited with special code 125) you could get a result like this:</p></div> <div class="listingblock"> <div class="content"> @@ -642,13 +724,13 @@ We cannot bisect more!</tt></pre> </div></div> <h3 id="_saving_a_log_and_replaying_it">Saving a log and replaying it</h3><div style="clear:left"></div> -<div class="para"><p>If you want to show other people your bisection process, you can get a +<div class="paragraph"><p>If you want to show other people your bisection process, you can get a log using for example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect log > bisect_log.txt</tt></pre> </div></div> -<div class="para"><p>And it is possible to replay it using:</p></div> +<div class="paragraph"><p>And it is possible to replay it using:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect replay bisect_log.txt</tt></pre> @@ -657,17 +739,17 @@ <h2 id="_git_bisect_details">"git bisect" details</h2> <div class="sectionbody"> <h3 id="_bisection_algorithm">Bisection algorithm</h3><div style="clear:left"></div> -<div class="para"><p>As the Git commits form a directed acyclic graph (DAG), finding the +<div class="paragraph"><p>As the Git commits form a directed acyclic graph (DAG), finding the best bisection commit to test at each step is not so simple. Anyway Linus found and implemented a "truly stupid" algorithm, later improved by Junio Hamano, that works quite well.</p></div> -<div class="para"><p>So the algorithm used by "git bisect" to find the best bisection +<div class="paragraph"><p>So the algorithm used by "git bisect" to find the best bisection commit when there are no skipped commits is the following:</p></div> -<div class="para"><p>1) keep only the commits that:</p></div> -<div class="para"><p>a) are ancestor of the "bad" commit (including the "bad" commit itself), +<div class="paragraph"><p>1) keep only the commits that:</p></div> +<div class="paragraph"><p>a) are ancestor of the "bad" commit (including the "bad" commit itself), b) are not ancestor of a "good" commit (excluding the "good" commits).</p></div> -<div class="para"><p>This means that we get rid of the uninteresting commits in the DAG.</p></div> -<div class="para"><p>For example if we start with a graph like this:</p></div> +<div class="paragraph"><p>This means that we get rid of the uninteresting commits in the DAG.</p></div> +<div class="paragraph"><p>For example if we start with a graph like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>G-Y-G-W-W-W-X-X-X-X @@ -680,7 +762,7 @@ -> time goes this way -></tt></pre> </div></div> -<div class="para"><p>where B is the "bad" commit, "G" are "good" commits and W, X, and Y +<div class="paragraph"><p>where B is the "bad" commit, "G" are "good" commits and W, X, and Y are other commits, we will get the following graph after this first step:</p></div> <div class="listingblock"> @@ -691,16 +773,16 @@ / W---W</tt></pre> </div></div> -<div class="para"><p>So only the W and B commits will be kept. Because commits X and Y will +<div class="paragraph"><p>So only the W and B commits will be kept. Because commits X and Y will have been removed by rules a) and b) respectively, and because commits G are removed by rule b) too.</p></div> -<div class="para"><p>Note for git users, that it is equivalent as keeping only the commit +<div class="paragraph"><p>Note for git users, that it is equivalent as keeping only the commit given by:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>git rev-list BAD --not GOOD1 GOOD2...</tt></pre> </div></div> -<div class="para"><p>Also note that we don't require the commits that are kept to be +<div class="paragraph"><p>Also note that we don’t require the commits that are kept to be descendants of a "good" commit. So in the following example, commits W and Z will be kept:</p></div> <div class="listingblock"> @@ -709,9 +791,9 @@ / Z-Z</tt></pre> </div></div> -<div class="para"><p>2) starting from the "good" ends of the graph, associate to each +<div class="paragraph"><p>2) starting from the "good" ends of the graph, associate to each commit the number of ancestors it has plus one</p></div> -<div class="para"><p>For example with the following graph where H is the "bad" commit and A +<div class="paragraph"><p>For example with the following graph where H is the "bad" commit and A and D are some parents of some "good" commits:</p></div> <div class="listingblock"> <div class="content"> @@ -721,7 +803,7 @@ / D---E</tt></pre> </div></div> -<div class="para"><p>this will give:</p></div> +<div class="paragraph"><p>this will give:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 3 @@ -731,10 +813,10 @@ 1 2/ D---E</tt></pre> </div></div> -<div class="para"><p>3) associate to each commit: min(X, N - X)</p></div> -<div class="para"><p>where X is the value associated to the commit in step 2) and N is the +<div class="paragraph"><p>3) associate to each commit: min(X, N - X)</p></div> +<div class="paragraph"><p>where X is the value associated to the commit in step 2) and N is the total number of commits in the graph.</p></div> -<div class="para"><p>In the above example we have N = 8, so this will give:</p></div> +<div class="paragraph"><p>In the above example we have N = 8, so this will give:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>1 2 3 @@ -744,24 +826,24 @@ 1 2/ D---E</tt></pre> </div></div> -<div class="para"><p>4) the best bisection point is the commit with the highest associated +<div class="paragraph"><p>4) the best bisection point is the commit with the highest associated number</p></div> -<div class="para"><p>So in the above example the best bisection point is commit C.</p></div> -<div class="para"><p>5) note that some shortcuts are implemented to speed up the algorithm</p></div> -<div class="para"><p>As we know N from the beginning, we know that min(X, N - X) can't be +<div class="paragraph"><p>So in the above example the best bisection point is commit C.</p></div> +<div class="paragraph"><p>5) note that some shortcuts are implemented to speed up the algorithm</p></div> +<div class="paragraph"><p>As we know N from the beginning, we know that min(X, N - X) can’t be greater than N/2. So during steps 2) and 3), if we would associate N/2 to a commit, then we know this is the best bisection point. So in this case we can just stop processing any other commit and return the current commit.</p></div> <h3 id="_bisection_algorithm_debugging">Bisection algorithm debugging</h3><div style="clear:left"></div> -<div class="para"><p>For any commit graph, you can see the number associated with each -commit using "git rev-list —bisect-all".</p></div> -<div class="para"><p>For example, for the above graph, a command like:</p></div> +<div class="paragraph"><p>For any commit graph, you can see the number associated with each +commit using "git rev-list --bisect-all".</p></div> +<div class="paragraph"><p>For example, for the above graph, a command like:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git rev-list --bisect-all BAD --not GOOD1 GOOD2</tt></pre> </div></div> -<div class="para"><p>would output something like:</p></div> +<div class="paragraph"><p>would output something like:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>e15b73ad3db9b48d7d1ade32f8cd23a751fe0ace (dist=3) @@ -774,19 +856,19 @@ 9e622a6dad403b71c40979743bb9d5be17b16bd6 (dist=0)</tt></pre> </div></div> <h3 id="_bisection_algorithm_discussed">Bisection algorithm discussed</h3><div style="clear:left"></div> -<div class="para"><p>First let's define "best bisection point". We will say that a commit X +<div class="paragraph"><p>First let’s define "best bisection point". We will say that a commit X is a best bisection point or a best bisection commit if knowing its state ("good" or "bad") gives as much information as possible whether the state of the commit happens to be "good" or "bad".</p></div> -<div class="para"><p>This means that the best bisection commits are the commits where the +<div class="paragraph"><p>This means that the best bisection commits are the commits where the following function is maximum:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>f(X) = min(information_if_good(X), information_if_bad(X))</tt></pre> </div></div> -<div class="para"><p>where information_if_good(X) is the information we get if X is good +<div class="paragraph"><p>where information_if_good(X) is the information we get if X is good and information_if_bad(X) is the information we get if X is bad.</p></div> -<div class="para"><p>Now we will suppose that there is only one "first bad commit". This +<div class="paragraph"><p>Now we will suppose that there is only one "first bad commit". This means that all its descendants are "bad" and all the other commits are "good". And we will suppose that all commits have an equal probability of being good or bad, or of being the first bad commit, so knowing the @@ -794,49 +876,49 @@ wherever these c commits are on the graph and whatever c is. (So we suppose that these commits being for example on a branch or near a good or a bad commit does not give more or less information).</p></div> -<div class="para"><p>Let's also suppose that we have a cleaned up graph like one after step +<div class="paragraph"><p>Let’s also suppose that we have a cleaned up graph like one after step 1) in the bisection algorithm above. This means that we can measure the information we get in terms of number of commit we can remove from the graph..</p></div> -<div class="para"><p>And let's take a commit X in the graph.</p></div> -<div class="para"><p>If X is found to be "good", then we know that its ancestors are all +<div class="paragraph"><p>And let’s take a commit X in the graph.</p></div> +<div class="paragraph"><p>If X is found to be "good", then we know that its ancestors are all "good", so we want to say that:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>information_if_good(X) = number_of_ancestors(X) (TRUE)</tt></pre> </div></div> -<div class="para"><p>And this is true because at step 1) b) we remove the ancestors of the +<div class="paragraph"><p>And this is true because at step 1) b) we remove the ancestors of the "good" commits.</p></div> -<div class="para"><p>If X is found to be "bad", then we know that its descendants are all +<div class="paragraph"><p>If X is found to be "bad", then we know that its descendants are all "bad", so we want to say that:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>information_if_bad(X) = number_of_descendants(X) (WRONG)</tt></pre> </div></div> -<div class="para"><p>But this is wrong because at step 1) a) we keep only the ancestors of +<div class="paragraph"><p>But this is wrong because at step 1) a) we keep only the ancestors of the bad commit. So we get more information when a commit is marked as "bad", because we also know that the ancestors of the previous "bad" commit that are not ancestors of the new "bad" commit are not the -first bad commit. We don't know if they are good or bad, but we know +first bad commit. We don’t know if they are good or bad, but we know that they are not the first bad commit because they are not ancestor of the new "bad" commit.</p></div> -<div class="para"><p>So when a commit is marked as "bad" we know we can remove all the +<div class="paragraph"><p>So when a commit is marked as "bad" we know we can remove all the commits in the graph except those that are ancestors of the new "bad" commit. This means that:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>information_if_bad(X) = N - number_of_ancestors(X) (TRUE)</tt></pre> </div></div> -<div class="para"><p>where N is the number of commits in the (cleaned up) graph.</p></div> -<div class="para"><p>So in the end this means that to find the best bisection commits we +<div class="paragraph"><p>where N is the number of commits in the (cleaned up) graph.</p></div> +<div class="paragraph"><p>So in the end this means that to find the best bisection commits we should maximize the function:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>f(X) = min(number_of_ancestors(X), N - number_of_ancestors(X))</tt></pre> </div></div> -<div class="para"><p>And this is nice because at step 2) we compute number_of_ancestors(X) +<div class="paragraph"><p>And this is nice because at step 2) we compute number_of_ancestors(X) and so at step 3) we compute f(X).</p></div> -<div class="para"><p>Let's take the following graph as an example:</p></div> +<div class="paragraph"><p>Let’s take the following graph as an example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> G-H-I-J @@ -845,12 +927,12 @@ \ / K-L-M-N</tt></pre> </div></div> -<div class="para"><p>If we compute the following non optimal function on it:</p></div> +<div class="paragraph"><p>If we compute the following non optimal function on it:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>g(X) = min(number_of_ancestors(X), number_of_descendants(X))</tt></pre> </div></div> -<div class="para"><p>we get:</p></div> +<div class="paragraph"><p>we get:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> 4 3 2 1 @@ -861,7 +943,7 @@ K-L-M-N 4 3 2 1</tt></pre> </div></div> -<div class="para"><p>but with the algorithm used by git bisect we get:</p></div> +<div class="paragraph"><p>but with the algorithm used by git bisect we get:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> 7 7 6 5 @@ -872,76 +954,76 @@ K-L-M-N 7 7 6 5</tt></pre> </div></div> -<div class="para"><p>So we chose G, H, K or L as the best bisection point, which is better +<div class="paragraph"><p>So we chose G, H, K or L as the best bisection point, which is better than F. Because if for example L is bad, then we will know not only that L, M and N are bad but also that G, H, I and J are not the first bad commit (since we suppose that there is only one first bad commit and it must be an ancestor of L).</p></div> -<div class="para"><p>So the current algorithm seems to be the best possible given what we +<div class="paragraph"><p>So the current algorithm seems to be the best possible given what we initially supposed.</p></div> <h3 id="_skip_algorithm">Skip algorithm</h3><div style="clear:left"></div> -<div class="para"><p>When some commits have been skipped (using "git bisect skip"), then +<div class="paragraph"><p>When some commits have been skipped (using "git bisect skip"), then the bisection algorithm is the same for step 1) to 3). But then we use roughly the following steps:</p></div> -<div class="para"><p>6) sort the commit by decreasing associated value</p></div> -<div class="para"><p>7) if the first commit has not been skipped, we can return it and stop +<div class="paragraph"><p>6) sort the commit by decreasing associated value</p></div> +<div class="paragraph"><p>7) if the first commit has not been skipped, we can return it and stop here</p></div> -<div class="para"><p>8) otherwise filter out all the skipped commits in the sorted list</p></div> -<div class="para"><p>9) use a pseudo random number generator (PRNG) to generate a random +<div class="paragraph"><p>8) otherwise filter out all the skipped commits in the sorted list</p></div> +<div class="paragraph"><p>9) use a pseudo random number generator (PRNG) to generate a random number between 0 and 1</p></div> -<div class="para"><p>10) multiply this random number with its square root to bias it toward +<div class="paragraph"><p>10) multiply this random number with its square root to bias it toward 0</p></div> -<div class="para"><p>11) multiply the result by the number of commits in the filtered list +<div class="paragraph"><p>11) multiply the result by the number of commits in the filtered list to get an index into this list</p></div> -<div class="para"><p>12) return the commit at the computed index</p></div> +<div class="paragraph"><p>12) return the commit at the computed index</p></div> <h3 id="_skip_algorithm_discussed">Skip algorithm discussed</h3><div style="clear:left"></div> -<div class="para"><p>After step 7) (in the skip algorithm), we could check if the second +<div class="paragraph"><p>After step 7) (in the skip algorithm), we could check if the second commit has been skipped and return it if it is not the case. And in fact that was the algorithm we used from when "git bisect skip" was developed in git version 1.5.4 (released on February 1st 2008) until git version 1.6.4 (released July 29th 2009).</p></div> -<div class="para"><p>But Ingo Molnar and H. Peter Anvin (another well known linux kernel +<div class="paragraph"><p>But Ingo Molnar and H. Peter Anvin (another well known linux kernel developer) both complained that sometimes the best bisection points all happened to be in an area where all the commits are untestable. And in this case the user was asked to test many untestable commits, which could be very inefficient.</p></div> -<div class="para"><p>Indeed untestable commits are often untestable because a breakage was +<div class="paragraph"><p>Indeed untestable commits are often untestable because a breakage was introduced at one time, and that breakage was fixed only after many other commits were introduced.</p></div> -<div class="para"><p>This breakage is of course most of the time unrelated to the breakage +<div class="paragraph"><p>This breakage is of course most of the time unrelated to the breakage we are trying to locate in the commit graph. But it prevents us to know if the interesting "bad behavior" is present or not.</p></div> -<div class="para"><p>So it is a fact that commits near an untestable commit have a high +<div class="paragraph"><p>So it is a fact that commits near an untestable commit have a high probability of being untestable themselves. And the best bisection commits are often found together too (due to the bisection algorithm).</p></div> -<div class="para"><p>This is why it is a bad idea to just chose the next best unskipped +<div class="paragraph"><p>This is why it is a bad idea to just chose the next best unskipped bisection commit when the first one has been skipped.</p></div> -<div class="para"><p>We found that most commits on the graph may give quite a lot of +<div class="paragraph"><p>We found that most commits on the graph may give quite a lot of information when they are tested. And the commits that will not on average give a lot of information are the one near the good and bad commits.</p></div> -<div class="para"><p>So using a PRNG with a bias to favor commits away from the good and +<div class="paragraph"><p>So using a PRNG with a bias to favor commits away from the good and bad commits looked like a good choice.</p></div> -<div class="para"><p>One obvious improvement to this algorithm would be to look for a +<div class="paragraph"><p>One obvious improvement to this algorithm would be to look for a commit that has an associated value near the one of the best bisection commit, and that is on another branch, before using the PRNG. Because if such a commit exists, then it is not very likely to be untestable too, so it will probably give more information than a nearly randomly chosen one.</p></div> <h3 id="_checking_merge_bases">Checking merge bases</h3><div style="clear:left"></div> -<div class="para"><p>There is another tweak in the bisection algorithm that has not been +<div class="paragraph"><p>There is another tweak in the bisection algorithm that has not been described in the "bisection algorithm" above.</p></div> -<div class="para"><p>We supposed in the previous examples that the "good" commits were +<div class="paragraph"><p>We supposed in the previous examples that the "good" commits were ancestors of the "bad" commit. But this is not a requirement of "git bisect".</p></div> -<div class="para"><p>Of course the "bad" commit cannot be an ancestor of a "good" commit, +<div class="paragraph"><p>Of course the "bad" commit cannot be an ancestor of a "good" commit, because the ancestors of the good commits are supposed to be "good". And all the "good" commits must be related to the bad commit. They cannot be on a branch that has no link with the branch of the "bad" commit. But it is possible for a good commit to be related to a bad commit and yet not be neither one of its ancestor nor one of its descendants.</p></div> -<div class="para"><p>For example, there can be a "main" branch, and a "dev" branch that was +<div class="paragraph"><p>For example, there can be a "main" branch, and a "dev" branch that was forked of the main branch at a commit named "D" like this:</p></div> <div class="listingblock"> <div class="content"> @@ -949,29 +1031,29 @@ \ H-I-J <--dev</tt></pre> </div></div> -<div class="para"><p>The commit "D" is called a "merge base" for branch "main" and "dev" -because it's the best common ancestor for these branches for a merge.</p></div> -<div class="para"><p>Now let's suppose that commit J is bad and commit G is good and that +<div class="paragraph"><p>The commit "D" is called a "merge base" for branch "main" and "dev" +because it’s the best common ancestor for these branches for a merge.</p></div> +<div class="paragraph"><p>Now let’s suppose that commit J is bad and commit G is good and that we apply the bisection algorithm like it has been previously described.</p></div> -<div class="para"><p>As described in step 1) b) of the bisection algorithm, we remove all +<div class="paragraph"><p>As described in step 1) b) of the bisection algorithm, we remove all the ancestors of the good commits because they are supposed to be good too.</p></div> -<div class="para"><p>So we would be left with only:</p></div> +<div class="paragraph"><p>So we would be left with only:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>H-I-J</tt></pre> </div></div> -<div class="para"><p>But what happens if the first bad commit is "B" and if it has been +<div class="paragraph"><p>But what happens if the first bad commit is "B" and if it has been fixed in the "main" branch by commit "F"?</p></div> -<div class="para"><p>The result of such a bisection would be that we would find that H is -the first bad commit, when in fact it's B. So that would be wrong!</p></div> -<div class="para"><p>And yes it can happen in practice that people working on one branch +<div class="paragraph"><p>The result of such a bisection would be that we would find that H is +the first bad commit, when in fact it’s B. So that would be wrong!</p></div> +<div class="paragraph"><p>And yes it can happen in practice that people working on one branch are not aware that people working on another branch fixed a bug! It could also happen that F fixed more than one bug or that it is a revert of some big development effort that was not ready to be released.</p></div> -<div class="para"><p>In fact development teams often maintain both a development branch and +<div class="paragraph"><p>In fact development teams often maintain both a development branch and a maintenance branch, and it would be quite easy for them if "git bisect" just worked when they want to bisect a regression on the development branch that is not on the maintenance branch. They should @@ -980,21 +1062,21 @@ <div class="content"> <pre><tt>$ git bisect start dev main</tt></pre> </div></div> -<div class="para"><p>To enable that additional nice feature, when a bisection is started +<div class="paragraph"><p>To enable that additional nice feature, when a bisection is started and when some good commits are not ancestors of the bad commit, we first compute the merge bases between the bad and the good commits and we chose these merge bases as the first commits that will be checked out and tested.</p></div> -<div class="para"><p>If it happens that one merge base is bad, then the bisection process +<div class="paragraph"><p>If it happens that one merge base is bad, then the bisection process is stopped with a message like:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>The merge base BBBBBB is bad. This means the bug has been fixed between BBBBBB and [GGGGGG,...].</tt></pre> </div></div> -<div class="para"><p>where BBBBBB is the sha1 hash of the bad merge base and [GGGGGG,…] +<div class="paragraph"><p>where BBBBBB is the sha1 hash of the bad merge base and [GGGGGG,…] is a comma separated list of the sha1 of the good commits.</p></div> -<div class="para"><p>If some of the merge bases are skipped, then the bisection process +<div class="paragraph"><p>If some of the merge bases are skipped, then the bisection process continues, but the following message is printed for each skipped merge base:</p></div> <div class="listingblock"> @@ -1003,49 +1085,49 @@ So we cannot be sure the first bad commit is between MMMMMM and BBBBBB. We continue anyway.</tt></pre> </div></div> -<div class="para"><p>where BBBBBB is the sha1 hash of the bad commit, MMMMMM is the sha1 +<div class="paragraph"><p>where BBBBBB is the sha1 hash of the bad commit, MMMMMM is the sha1 hash of the merge base that is skipped and [GGGGGG,…] is a comma separated list of the sha1 of the good commits.</p></div> -<div class="para"><p>So if there is no bad merge base, the bisection process continues as +<div class="paragraph"><p>So if there is no bad merge base, the bisection process continues as usual after this step.</p></div> </div> <h2 id="_best_bisecting_practices">Best bisecting practices</h2> <div class="sectionbody"> <h3 id="_using_test_suites_and_git_bisect_together">Using test suites and git bisect together</h3><div style="clear:left"></div> -<div class="para"><p>If you both have a test suite and use git bisect, then it becomes less +<div class="paragraph"><p>If you both have a test suite and use git bisect, then it becomes less important to check that all tests pass after each commit. Though of course it is probably a good idea to have some checks to avoid breaking too many things because it could make bisecting other bugs more difficult.</p></div> -<div class="para"><p>You can focus your efforts to check at a few points (for example rc +<div class="paragraph"><p>You can focus your efforts to check at a few points (for example rc and beta releases) that all the T test cases pass for all the N -configurations. And when some tests don't pass you can use "git +configurations. And when some tests don’t pass you can use "git bisect" (or better "git bisect run"). So you should perform roughly:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>c * N * T + b * M * log2(M) tests</tt></pre> </div></div> -<div class="para"><p>where c is the number of rounds of test (so a small constant) and b is +<div class="paragraph"><p>where c is the number of rounds of test (so a small constant) and b is the ratio of bug per commit (hopefully a small constant too).</p></div> -<div class="para"><p>So of course it's much better as it's O(N <strong> T) vs O(N </strong> T * M) if +<div class="paragraph"><p>So of course it’s much better as it’s O(N * T) vs O(N * T * M) if you would test everything after each commit.</p></div> -<div class="para"><p>This means that test suites are good to prevent some bugs from being +<div class="paragraph"><p>This means that test suites are good to prevent some bugs from being committed and they are also quite good to tell you that you have some bugs. But they are not so good to tell you where some bugs have been introduced. To tell you that efficiently, git bisect is needed.</p></div> -<div class="para"><p>The other nice thing with test suites, is that when you have one, you +<div class="paragraph"><p>The other nice thing with test suites, is that when you have one, you already know how to test for bad behavior. So you can use this knowledge to create a new test case for "git bisect" when it appears that there is a regression. So it will be easier to bisect the bug and fix it. And then you can add the test case you just created to your test suite.</p></div> -<div class="para"><p>So if you know how to create test cases and how to bisect, you will be +<div class="paragraph"><p>So if you know how to create test cases and how to bisect, you will be subject to a virtuous circle:</p></div> -<div class="para"><p>more tests => easier to create tests => easier to bisect => more tests</p></div> -<div class="para"><p>So test suites and "git bisect" are complementary tools that are very +<div class="paragraph"><p>more tests ⇒ easier to create tests ⇒ easier to bisect ⇒ more tests</p></div> +<div class="paragraph"><p>So test suites and "git bisect" are complementary tools that are very powerful and efficient when used together.</p></div> <h3 id="_bisecting_build_failures">Bisecting build failures</h3><div style="clear:left"></div> -<div class="para"><p>You can very easily automatically bisect broken builds using something +<div class="paragraph"><p>You can very easily automatically bisect broken builds using something like:</p></div> <div class="listingblock"> <div class="content"> @@ -1053,17 +1135,17 @@ $ git bisect run make</tt></pre> </div></div> <h3 id="_passing_sh_c_some_commands_to_git_bisect_run">Passing sh -c "some commands" to "git bisect run"</h3><div style="clear:left"></div> -<div class="para"><p>For example:</p></div> +<div class="paragraph"><p>For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect run sh -c "make || exit 125; ./my_app | grep 'good output'"</tt></pre> </div></div> -<div class="para"><p>On the other hand if you do this often, then it can be worth having +<div class="paragraph"><p>On the other hand if you do this often, then it can be worth having scripts to avoid too much typing.</p></div> <h3 id="_finding_performance_regressions">Finding performance regressions</h3><div style="clear:left"></div> -<div class="para"><p>Here is an example script that comes slightly modified from a real +<div class="paragraph"><p>Here is an example script that comes slightly modified from a real world script used by Junio Hamano <a href="#4">[4]</a>.</p></div> -<div class="para"><p>This script can be passed to "git bisect run" to find the commit that +<div class="paragraph"><p>This script can be passed to "git bisect run" to find the commit that introduced a performance regression:</p></div> <div class="listingblock"> <div class="content"> @@ -1096,44 +1178,44 @@ fi</tt></pre> </div></div> <h3 id="_following_general_best_practices">Following general best practices</h3><div style="clear:left"></div> -<div class="para"><p>It is obviously a good idea not to have commits with changes that +<div class="paragraph"><p>It is obviously a good idea not to have commits with changes that knowingly break things, even if some other commits later fix the breakage.</p></div> -<div class="para"><p>It is also a good idea when using any VCS to have only one small +<div class="paragraph"><p>It is also a good idea when using any VCS to have only one small logical change in each commit.</p></div> -<div class="para"><p>The smaller the changes in your commit, the most effective "git +<div class="paragraph"><p>The smaller the changes in your commit, the most effective "git bisect" will be. And you will probably need "git bisect" less in the first place, as small changes are easier to review even if they are only reviewed by the committer.</p></div> -<div class="para"><p>Another good idea is to have good commit messages. They can be very +<div class="paragraph"><p>Another good idea is to have good commit messages. They can be very helpful to understand why some changes were made.</p></div> -<div class="para"><p>These general best practices are very helpful if you bisect often.</p></div> +<div class="paragraph"><p>These general best practices are very helpful if you bisect often.</p></div> <h3 id="_avoiding_bug_prone_merges">Avoiding bug prone merges</h3><div style="clear:left"></div> -<div class="para"><p>First merges by themselves can introduce some regressions even when +<div class="paragraph"><p>First merges by themselves can introduce some regressions even when the merge needs no source code conflict resolution. This is because a semantic change can happen in one branch while the other branch is not aware of it.</p></div> -<div class="para"><p>For example one branch can change the semantic of a function while the +<div class="paragraph"><p>For example one branch can change the semantic of a function while the other branch add more calls to the same function.</p></div> -<div class="para"><p>This is made much worse if many files have to be fixed to resolve -conflicts. That's why such merges are called "evil merges". They can +<div class="paragraph"><p>This is made much worse if many files have to be fixed to resolve +conflicts. That’s why such merges are called "evil merges". They can make regressions very difficult to track down. It can even be misleading to know the first bad commit if it happens to be such a merge, because people might think that the bug comes from bad conflict resolution when it comes from a semantic change in one branch.</p></div> -<div class="para"><p>Anyway "git rebase" can be used to linearize history. This can be used +<div class="paragraph"><p>Anyway "git rebase" can be used to linearize history. This can be used either to avoid merging in the first place. Or it can be used to bisect on a linear history instead of the non linear one, as this should give more information in case of a semantic change in one branch.</p></div> -<div class="para"><p>Merges can be also made simpler by using smaller branches or by using +<div class="paragraph"><p>Merges can be also made simpler by using smaller branches or by using many topic branches instead of only long version related branches.</p></div> -<div class="para"><p>And testing can be done more often in special integration branches +<div class="paragraph"><p>And testing can be done more often in special integration branches like linux-next for the linux kernel.</p></div> <h3 id="_adapting_your_work_flow">Adapting your work-flow</h3><div style="clear:left"></div> -<div class="para"><p>A special work-flow to process regressions can give great results.</p></div> -<div class="para"><p>Here is an example of a work-flow used by Andreas Ericsson:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>A special work-flow to process regressions can give great results.</p></div> +<div class="paragraph"><p>Here is an example of a work-flow used by Andreas Ericsson:</p></div> +<div class="ulist"><ul> <li> <p> write, in the test suite, a test script that exposes the regression @@ -1155,78 +1237,81 @@ </p> </li> </ul></div> -<div class="para"><p>And here is what Andreas said about this work-flow <a href="#5">[5]</a>:</p></div> +<div class="paragraph"><p>And here is what Andreas said about this work-flow <a href="#5">[5]</a>:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>To give some hard figures, we used to have an average report-to-fix +<div class="paragraph"><p>To give some hard figures, we used to have an average report-to-fix cycle of 142.6 hours (according to our somewhat weird bug-tracker -which just measures wall-clock time). Since we moved to git, we've +which just measures wall-clock time). Since we moved to git, we’ve lowered that to 16.2 hours. Primarily because we can stay on top of -the bug fixing now, and because everyone's jockeying to get to fix -bugs (we're quite proud of how lazy we are to let git find the bugs +the bug fixing now, and because everyone’s jockeying to get to fix +bugs (we’re quite proud of how lazy we are to let git find the bugs for us). Each new release results in ~40% fewer bugs (almost certainly due to how we now feel about writing tests).</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>Clearly this work-flow uses the virtuous circle between test suites +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>Clearly this work-flow uses the virtuous circle between test suites and "git bisect". In fact it makes it the standard procedure to deal with regression.</p></div> -<div class="para"><p>In other messages Andreas says that they also use the "best practices" +<div class="paragraph"><p>In other messages Andreas says that they also use the "best practices" described above: small logical commits, topic branches, no evil merge,… These practices all improve the bisectability of the commit graph, by making it easier and more useful to bisect.</p></div> -<div class="para"><p>So a good work-flow should be designed around the above points. That +<div class="paragraph"><p>So a good work-flow should be designed around the above points. That is making bisecting easier, more useful and standard.</p></div> <h3 id="_involving_qa_people_and_if_possible_end_users">Involving QA people and if possible end users</h3><div style="clear:left"></div> -<div class="para"><p>One nice about "git bisect" is that it is not only a developer +<div class="paragraph"><p>One nice about "git bisect" is that it is not only a developer tool. It can effectively be used by QA people or even end users (if they have access to the source code or if they can get access to all the builds).</p></div> -<div class="para"><p>There was a discussion at one point on the linux kernel mailing list +<div class="paragraph"><p>There was a discussion at one point on the linux kernel mailing list of whether it was ok to always ask end user to bisect, and very good points were made to support the point of view that it is ok.</p></div> -<div class="para"><p>For example David Miller wrote <a href="#6">[6]</a>:</p></div> +<div class="paragraph"><p>For example David Miller wrote <a href="#6">[6]</a>:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>What people don't get is that this is a situation where the "end node +<div class="paragraph"><p>What people don’t get is that this is a situation where the "end node principle" applies. When you have limited resources (here: developers) -you don't push the bulk of the burden upon them. Instead you push +you don’t push the bulk of the burden upon them. Instead you push things out to the resource you have a lot of, the end nodes (here: users), so that the situation actually scales.</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>This means that it is often "cheaper" if QA people or end users can do +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>This means that it is often "cheaper" if QA people or end users can do it.</p></div> -<div class="para"><p>What is interesting too is that end users that are reporting bugs (or +<div class="paragraph"><p>What is interesting too is that end users that are reporting bugs (or QA people that reproduced a bug) have access to the environment where the bug happens. So they can often more easily reproduce a regression. And if they can bisect, then more information will be extracted from the environment where the bug happens, which means that it will be easier to understand and then fix the bug.</p></div> -<div class="para"><p>For open source projects it can be a good way to get more useful +<div class="paragraph"><p>For open source projects it can be a good way to get more useful contributions from end users, and to introduce them to QA and development activities.</p></div> <h3 id="_using_complex_scripts">Using complex scripts</h3><div style="clear:left"></div> -<div class="para"><p>In some cases like for kernel development it can be worth developing +<div class="paragraph"><p>In some cases like for kernel development it can be worth developing complex scripts to be able to fully automate bisecting.</p></div> -<div class="para"><p>Here is what Ingo Molnar says about that <a href="#7">[7]</a>:</p></div> +<div class="paragraph"><p>Here is what Ingo Molnar says about that <a href="#7">[7]</a>:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>i have a fully automated bootup-hang bisection script. It is based on +<div class="paragraph"><p>i have a fully automated bootup-hang bisection script. It is based on "git-bisect run". I run the script, it builds and boots kernels fully automatically, and when the bootup fails (the script notices that via the serial log, which it continuously watches - or via a timeout, if -the system does not come up within 10 minutes it's a "bad" kernel), +the system does not come up within 10 minutes it’s a "bad" kernel), the script raises my attention via a beep and i power cycle the test box. (yeah, i should make use of a managed power outlet to 100% automate it)</p></div> -<div class="attribution"> -</div></div></div> +</div> +<div class="quoteblock-attribution"> +</div></div> <h3 id="_combining_test_suites_git_bisect_and_other_systems_together">Combining test suites, git bisect and other systems together</h3><div style="clear:left"></div> -<div class="para"><p>We have seen that test suites an git bisect are very powerful when +<div class="paragraph"><p>We have seen that test suites an git bisect are very powerful when used together. It can be even more powerful if you can combine them with other systems.</p></div> -<div class="para"><p>For example some test suites could be run automatically at night with +<div class="paragraph"><p>For example some test suites could be run automatically at night with some unusual (or even random) configurations. And if a regression is found by a test suite, then "git bisect" can be automatically launched, and its result can be emailed to the author of the first bad @@ -1236,51 +1321,51 @@ <h2 id="_the_future_of_bisecting">The future of bisecting</h2> <div class="sectionbody"> <h3 id="_git_replace">"git replace"</h3><div style="clear:left"></div> -<div class="para"><p>We saw earlier that "git bisect skip" is now using a PRNG to try to +<div class="paragraph"><p>We saw earlier that "git bisect skip" is now using a PRNG to try to avoid areas in the commit graph where commits are untestable. The problem is that sometimes the first bad commit will be in an untestable area.</p></div> -<div class="para"><p>To simplify the discussion we will suppose that the untestable area is +<div class="paragraph"><p>To simplify the discussion we will suppose that the untestable area is a simple string of commits and that it was created by a breakage -introduced by one commit (let's call it BBC for bisect breaking -commit) and later fixed by another one (let's call it BFC for bisect +introduced by one commit (let’s call it BBC for bisect breaking +commit) and later fixed by another one (let’s call it BFC for bisect fixing commit).</p></div> -<div class="para"><p>For example:</p></div> +<div class="paragraph"><p>For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...</tt></pre> </div></div> -<div class="para"><p>where we know that Y is good and BFC is bad, and where BBC and X1 to +<div class="paragraph"><p>where we know that Y is good and BFC is bad, and where BBC and X1 to X6 are untestable.</p></div> -<div class="para"><p>In this case if you are bisecting manually, what you can do is create +<div class="paragraph"><p>In this case if you are bisecting manually, what you can do is create a special branch that starts just before the BBC. The first commit in this branch should be the BBC with the BFC squashed into it. And the other commits in the branch should be the commits between BBC and BFC rebased on the first commit of the branch and then the commit after BFC also rebased on.</p></div> -<div class="para"><p>For example:</p></div> +<div class="paragraph"><p>For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z' / ...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...</tt></pre> </div></div> -<div class="para"><p>where commits quoted with ' have been rebased.</p></div> -<div class="para"><p>You can easily create such a branch with Git using interactive rebase.</p></div> -<div class="para"><p>For example using:</p></div> +<div class="paragraph"><p>where commits quoted with ' have been rebased.</p></div> +<div class="paragraph"><p>You can easily create such a branch with Git using interactive rebase.</p></div> +<div class="paragraph"><p>For example using:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git rebase -i Y Z</tt></pre> </div></div> -<div class="para"><p>and then moving BFC after BBC and squashing it.</p></div> -<div class="para"><p>After that you can start bisecting as usual in the new branch and you +<div class="paragraph"><p>and then moving BFC after BBC and squashing it.</p></div> +<div class="paragraph"><p>After that you can start bisecting as usual in the new branch and you should eventually find the first bad commit.</p></div> -<div class="para"><p>For example:</p></div> +<div class="paragraph"><p>For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect start Z' Y</tt></pre> </div></div> -<div class="para"><p>If you are using "git bisect run", you can use the same manual fix up +<div class="paragraph"><p>If you are using "git bisect run", you can use the same manual fix up as above, and then start another "git bisect run" in the special branch. Or as the "git bisect" man page says, the script passed to "git bisect run" can apply a patch before it compiles and test the @@ -1289,57 +1374,57 @@ "git bisect" will be able to find the first bad commit. And the script should not forget to remove the patch once the testing is done before exiting from the script.</p></div> -<div class="para"><p>(Note that instead of a patch you can use "git cherry-pick BFC" to -apply the fix, and in this case you should use "git reset —hard +<div class="paragraph"><p>(Note that instead of a patch you can use "git cherry-pick BFC" to +apply the fix, and in this case you should use "git reset --hard HEAD^" to revert the cherry-pick after testing and before returning from the script.)</p></div> -<div class="para"><p>But the above ways to work around untestable areas are a little bit +<div class="paragraph"><p>But the above ways to work around untestable areas are a little bit clunky. Using special branches is nice because these branches can be shared by developers like usual branches, but the risk is that people will get many such branches. And it disrupts the normal "git bisect" work-flow. So, if you want to use "git bisect run" completely automatically, you have to add special code in your script to restart bisection in the special branches.</p></div> -<div class="para"><p>Anyway one can notice in the above special branch example that the Z' +<div class="paragraph"><p>Anyway one can notice in the above special branch example that the Z' and Z commits should point to the same source code state (the same -"tree" in git parlance). That's because Z' result from applying the +"tree" in git parlance). That’s because Z' result from applying the same changes as Z just in a slightly different order.</p></div> -<div class="para"><p>So if we could just "replace" Z by Z' when we bisect, then we would +<div class="paragraph"><p>So if we could just "replace" Z by Z' when we bisect, then we would not need to add anything to a script. It would just work for anyone in the project sharing the special branches and the replacements.</p></div> -<div class="para"><p>With the example above that would give:</p></div> +<div class="paragraph"><p>With the example above that would give:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'-... / ...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z</tt></pre> </div></div> -<div class="para"><p>That's why the "git replace" command was created. Technically it +<div class="paragraph"><p>That’s why the "git replace" command was created. Technically it stores replacements "refs" in the "refs/replace/" hierarchy. These "refs" are like branches (that are stored in "refs/heads/") or tags (that are stored in "refs/tags"), and that means that they can automatically be shared like branches or tags among developers.</p></div> -<div class="para"><p>"git replace" is a very powerful mechanism. It can be used to fix +<div class="paragraph"><p>"git replace" is a very powerful mechanism. It can be used to fix commits in already released history, for example to change the commit message or the author. And it can also be used instead of git "grafts" to link a repository with another old repository.</p></div> -<div class="para"><p>In fact it's this last feature that "sold" it to the git community, so -it is now in the "master" branch of git's git repository and it should +<div class="paragraph"><p>In fact it’s this last feature that "sold" it to the git community, so +it is now in the "master" branch of git’s git repository and it should be released in git 1.6.5 in October or November 2009.</p></div> -<div class="para"><p>One problem with "git replace" is that currently it stores all the +<div class="paragraph"><p>One problem with "git replace" is that currently it stores all the replacements refs in "refs/replace/", but it would be perhaps better if the replacement refs that are useful only for bisecting would be in "refs/replace/bisect/". This way the replacement refs could be used only for bisecting, while other refs directly in "refs/replace/" would be used nearly all the time.</p></div> <h3 id="_bisecting_sporadic_bugs">Bisecting sporadic bugs</h3><div style="clear:left"></div> -<div class="para"><p>Another possible improvement to "git bisect" would be to optionally +<div class="paragraph"><p>Another possible improvement to "git bisect" would be to optionally add some redundancy to the tests performed so that it would be more reliable when tracking sporadic bugs.</p></div> -<div class="para"><p>This has been requested by some kernel developers because some bugs +<div class="paragraph"><p>This has been requested by some kernel developers because some bugs called sporadic bugs do not appear in all the kernel builds because they are very dependent on the compiler output.</p></div> -<div class="para"><p>The idea is that every 3 test for example, "git bisect" could ask the +<div class="paragraph"><p>The idea is that every 3 test for example, "git bisect" could ask the user to test a commit that has already been found to be "good" or "bad" (because one of its descendants or one of its ancestors has been found to be "good" or "bad" respectively). If it happens that a commit @@ -1347,82 +1432,84 @@ aborted early, hopefully before too many mistakes have been made. Then the user will have to look at what happened and then restart the bisection using a fixed bisect log.</p></div> -<div class="para"><p>There is already a project called BBChop created by Ealdwulf Wuffinga +<div class="paragraph"><p>There is already a project called BBChop created by Ealdwulf Wuffinga on Github that does something like that using Bayesian Search Theory <a href="#9">[9]</a>:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>BBChop is like <em>git bisect</em> (or equivalent), but works when your bug +<div class="paragraph"><p>BBChop is like <em>git bisect</em> (or equivalent), but works when your bug is intermittent. That is, it works in the presence of false negatives (when a version happens to work this time even though it contains the bug). It assumes that there are no false positives (in principle, the same approach would work, but adding it may be non-trivial).</p></div> -<div class="attribution"> -</div></div></div> -<div class="para"><p>But BBChop is independent of any VCS and it would be easier for Git +</div> +<div class="quoteblock-attribution"> +</div></div> +<div class="paragraph"><p>But BBChop is independent of any VCS and it would be easier for Git users to have something integrated in Git.</p></div> </div> <h2 id="_conclusion">Conclusion</h2> <div class="sectionbody"> -<div class="para"><p>We have seen that regressions are an important problem, and that "git +<div class="paragraph"><p>We have seen that regressions are an important problem, and that "git bisect" has nice features that complement very well practices and other tools, especially test suites, that are generally used to fight regressions. But it might be needed to change some work-flows and (bad) habits to get the most out of it.</p></div> -<div class="para"><p>Some improvements to the algorithms inside "git bisect" are possible +<div class="paragraph"><p>Some improvements to the algorithms inside "git bisect" are possible and some new features could help in some cases, but overall "git bisect" works already very well, is used a lot, and is already very -useful. To back up that last claim, let's give the final word to Ingo +useful. To back up that last claim, let’s give the final word to Ingo Molnar when he was asked by the author how much time does he think "git bisect" saves him when he uses it:</p></div> <div class="quoteblock"> <div class="quoteblock-content"> -<div class="para"><p>a _lot_.</p></div> -<div class="para"><p>About ten years ago did i do my first <em>bisection</em> of a Linux patch +<div class="paragraph"><p>a <em>lot</em>.</p></div> +<div class="paragraph"><p>About ten years ago did i do my first <em>bisection</em> of a Linux patch queue. That was prior the Git (and even prior the BitKeeper) days. I literally days spent sorting out patches, creating what in essence were standalone commits that i guessed to be related to that bug.</p></div> -<div class="para"><p>It was a tool of absolute last resort. I'd rather spend days looking +<div class="paragraph"><p>It was a tool of absolute last resort. I’d rather spend days looking at printk output than do a manual <em>patch bisection</em>.</p></div> -<div class="para"><p>With Git bisect it's a breeze: in the best case i can get a ~15 step +<div class="paragraph"><p>With Git bisect it’s a breeze: in the best case i can get a ~15 step kernel bisection done in 20-30 minutes, in an automated way. Even with -manual help or when bisecting multiple, overlapping bugs, it's rarely +manual help or when bisecting multiple, overlapping bugs, it’s rarely more than an hour.</p></div> -<div class="para"><p>In fact it's invaluable because there are bugs i would never even -_try_ to debug if it wasn't for git bisect. In the past there were bug +<div class="paragraph"><p>In fact it’s invaluable because there are bugs i would never even +<em>try</em> to debug if it wasn’t for git bisect. In the past there were bug patterns that were immediately hopeless for me to debug - at best i could send the crash/bug signature to lkml and hope that someone else can think of something.</p></div> -<div class="para"><p>And even if a bisection fails today it tells us something valuable -about the bug: that it's non-deterministic - timing or kernel image +<div class="paragraph"><p>And even if a bisection fails today it tells us something valuable +about the bug: that it’s non-deterministic - timing or kernel image layout dependent.</p></div> -<div class="para"><p>So git bisect is unconditional goodness - and feel free to quote that +<div class="paragraph"><p>So git bisect is unconditional goodness - and feel free to quote that ;-)</p></div> -<div class="attribution"> -</div></div></div> +</div> +<div class="quoteblock-attribution"> +</div></div> </div> <h2 id="_acknowledgements">Acknowledgements</h2> <div class="sectionbody"> -<div class="para"><p>Many thanks to Junio Hamano for his help in reviewing this paper, for +<div class="paragraph"><p>Many thanks to Junio Hamano for his help in reviewing this paper, for reviewing the patches I sent to the git mailing list, for discussing some ideas and helping me improve them, for improving "git bisect" a lot and for his awesome work in maintaining and developing Git.</p></div> -<div class="para"><p>Many thanks to Ingo Molnar for giving me very useful information that +<div class="paragraph"><p>Many thanks to Ingo Molnar for giving me very useful information that appears in this paper, for commenting on this paper, for his suggestions to improve "git bisect" and for evangelizing "git bisect" on the linux kernel mailing lists.</p></div> -<div class="para"><p>Many thanks to Linus Torvalds for inventing, developing and +<div class="paragraph"><p>Many thanks to Linus Torvalds for inventing, developing and evangelizing "git bisect", Git and Linux.</p></div> -<div class="para"><p>Many thanks to the many other great people who helped one way or +<div class="paragraph"><p>Many thanks to the many other great people who helped one way or another when I worked on git, especially to Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour.</p></div> -<div class="para"><p>Many thanks to the Linux-Kongress program committee for choosing the +<div class="paragraph"><p>Many thanks to the Linux-Kongress program committee for choosing the author to given a talk and for publishing this paper.</p></div> </div> <h2 id="_references">References</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <a id="1"></a>[1] <a href="http://www.nist.gov/public_affairs/releases/n02-10.htm"><em>Software Errors Cost U.S. Economy $59.5 Billion Annually</em>. Nist News Release.</a> @@ -1455,7 +1542,7 @@ </li> <li> <p> -<a id="7"></a>[7] <a href="http://article.gmane.org/gmane.linux.scsi/36652/">Ingo Molnar. <em>Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha</em>. Gmane.</a> +<a id="7"></a>[7] <a href="http://article.gmane.org/gmane.linux.scsi/36652/">Ingo Molnar. <em>Re: BUG 2.6.23-rc3 can’t see sd partitions on Alpha</em>. Gmane.</a> </p> </li> <li> @@ -1472,7 +1559,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:08 UTC +Last updated 2010-09-03 21:29:54 UTC </div> </div> </body> diff --git a/git-bisect.html b/git-bisect.html index 363397b..325ffd6 100644 --- a/git-bisect.html +++ b/git-bisect.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-bisect(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-bisect(1)</title> </head> <body> <div id="header"> @@ -318,13 +412,13 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git bisect</em> <subcommand> <options></p></div> +<div class="paragraph"><p><em>git bisect</em> <subcommand> <options></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>The command takes various subcommands, and different options depending +<div class="paragraph"><p>The command takes various subcommands, and different options depending on the subcommand:</p></div> <div class="literalblock"> <div class="content"> @@ -339,14 +433,14 @@ git bisect log git bisect run <cmd>...</tt></pre> </div></div> -<div class="para"><p>This command uses <em>git rev-list --bisect</em> to help drive the +<div class="paragraph"><p>This command uses <em>git rev-list --bisect</em> to help drive the binary search process to find which change introduced a bug, given an old "good" commit object name and a later "bad" commit object name.</p></div> <h3 id="_getting_help">Getting help</h3><div style="clear:left"></div> -<div class="para"><p>Use "git bisect" to get a short usage description, and "git bisect +<div class="paragraph"><p>Use "git bisect" to get a short usage description, and "git bisect help" or "git bisect -h" to get a long usage description.</p></div> <h3 id="_basic_bisect_commands_start_bad_good">Basic bisect commands: start, bad, good</h3><div style="clear:left"></div> -<div class="para"><p>Using the Linux kernel tree as an example, basic use of the bisect +<div class="paragraph"><p>Using the Linux kernel tree as an example, basic use of the bisect command is as follows:</p></div> <div class="listingblock"> <div class="content"> @@ -355,58 +449,58 @@ $ git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version # tested that was good</tt></pre> </div></div> -<div class="para"><p>When you have specified at least one bad and one good version, the +<div class="paragraph"><p>When you have specified at least one bad and one good version, the command bisects the revision tree and outputs something similar to the following:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Bisecting: 675 revisions left to test after this</tt></pre> </div></div> -<div class="para"><p>The state in the middle of the set of revisions is then checked out. +<div class="paragraph"><p>The state in the middle of the set of revisions is then checked out. You would now compile that kernel and boot it. If the booted kernel works correctly, you would then issue the following command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect good # this one is good</tt></pre> </div></div> -<div class="para"><p>The output of this command would be something similar to the following:</p></div> +<div class="paragraph"><p>The output of this command would be something similar to the following:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>Bisecting: 337 revisions left to test after this</tt></pre> </div></div> -<div class="para"><p>You keep repeating this process, compiling the tree, testing it, and +<div class="paragraph"><p>You keep repeating this process, compiling the tree, testing it, and depending on whether it is good or bad issuing the command "git bisect good" or "git bisect bad" to ask for the next bisection.</p></div> -<div class="para"><p>Eventually there will be no more revisions left to bisect, and you +<div class="paragraph"><p>Eventually there will be no more revisions left to bisect, and you will have been left with the first bad kernel revision in "refs/bisect/bad".</p></div> <h3 id="_bisect_reset">Bisect reset</h3><div style="clear:left"></div> -<div class="para"><p>After a bisect session, to clean up the bisection state and return to +<div class="paragraph"><p>After a bisect session, to clean up the bisection state and return to the original HEAD, issue the following command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect reset</tt></pre> </div></div> -<div class="para"><p>By default, this will return your tree to the commit that was checked +<div class="paragraph"><p>By default, this will return your tree to the commit that was checked out before <tt>git bisect start</tt>. (A new <tt>git bisect start</tt> will also do that, as it cleans up the old bisection state.)</p></div> -<div class="para"><p>With an optional argument, you can return to a different commit +<div class="paragraph"><p>With an optional argument, you can return to a different commit instead:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect reset <commit></tt></pre> </div></div> -<div class="para"><p>For example, <tt>git bisect reset HEAD</tt> will leave you on the current +<div class="paragraph"><p>For example, <tt>git bisect reset HEAD</tt> will leave you on the current bisection commit and avoid switching commits at all, while <tt>git bisect reset bisect/bad</tt> will check out the first bad revision.</p></div> <h3 id="_bisect_visualize">Bisect visualize</h3><div style="clear:left"></div> -<div class="para"><p>To see the currently remaining suspects in <em>gitk</em>, issue the following +<div class="paragraph"><p>To see the currently remaining suspects in <em>gitk</em>, issue the following command during the bisection process:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect visualize</tt></pre> </div></div> -<div class="para"><p><tt>view</tt> may also be used as a synonym for <tt>visualize</tt>.</p></div> -<div class="para"><p>If the <em>DISPLAY</em> environment variable is not set, <em>git log</em> is used +<div class="paragraph"><p><tt>view</tt> may also be used as a synonym for <tt>visualize</tt>.</p></div> +<div class="paragraph"><p>If the <em>DISPLAY</em> environment variable is not set, <em>git log</em> is used instead. You can also give command line options such as <tt>-p</tt> and <tt>--stat</tt>.</p></div> <div class="listingblock"> @@ -414,13 +508,13 @@ <pre><tt>$ git bisect view --stat</tt></pre> </div></div> <h3 id="_bisect_log_and_bisect_replay">Bisect log and bisect replay</h3><div style="clear:left"></div> -<div class="para"><p>After having marked revisions as good or bad, issue the following +<div class="paragraph"><p>After having marked revisions as good or bad, issue the following command to show what has been done so far:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect log</tt></pre> </div></div> -<div class="para"><p>If you discover that you made a mistake in specifying the status of a +<div class="paragraph"><p>If you discover that you made a mistake in specifying the status of a revision, you can save the output of this command to a file, edit it to remove the incorrect entries, and then issue the following commands to return to a corrected state:</p></div> @@ -430,12 +524,12 @@ $ git bisect replay that-file</tt></pre> </div></div> <h3 id="_avoiding_testing_a_commit">Avoiding testing a commit</h3><div style="clear:left"></div> -<div class="para"><p>If, in the middle of a bisect session, you know that the next suggested +<div class="paragraph"><p>If, in the middle of a bisect session, you know that the next suggested revision is not a good one to test (e.g. the change the commit introduces is known not to work in your environment and you know it does not have anything to do with the bug you are chasing), you may want to find a nearby commit and try that instead.</p></div> -<div class="para"><p>For example:</p></div> +<div class="paragraph"><p>For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect good/bad # previous round was good or bad. @@ -444,42 +538,42 @@ $ git reset --hard HEAD~3 # try 3 revisions before what # was suggested</tt></pre> </div></div> -<div class="para"><p>Then compile and test the chosen revision, and afterwards mark +<div class="paragraph"><p>Then compile and test the chosen revision, and afterwards mark the revision as good or bad in the usual manner.</p></div> <h3 id="_bisect_skip">Bisect skip</h3><div style="clear:left"></div> -<div class="para"><p>Instead of choosing by yourself a nearby commit, you can ask git +<div class="paragraph"><p>Instead of choosing by yourself a nearby commit, you can ask git to do it for you by issuing the command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect skip # Current version cannot be tested</tt></pre> </div></div> -<div class="para"><p>But git may eventually be unable to tell the first bad commit among +<div class="paragraph"><p>But git may eventually be unable to tell the first bad commit among a bad commit and one or more skipped commits.</p></div> -<div class="para"><p>You can even skip a range of commits, instead of just one commit, +<div class="paragraph"><p>You can even skip a range of commits, instead of just one commit, using the "<em><commit1></em>..<em><commit2></em>" notation. For example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect skip v2.5..v2.6</tt></pre> </div></div> -<div class="para"><p>This tells the bisect process that no commit after <tt>v2.5</tt>, up to and +<div class="paragraph"><p>This tells the bisect process that no commit after <tt>v2.5</tt>, up to and including <tt>v2.6</tt>, should be tested.</p></div> -<div class="para"><p>Note that if you also want to skip the first commit of the range you +<div class="paragraph"><p>Note that if you also want to skip the first commit of the range you would issue the command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect skip v2.5 v2.5..v2.6</tt></pre> </div></div> -<div class="para"><p>This tells the bisect process that the commits between <tt>v2.5</tt> included +<div class="paragraph"><p>This tells the bisect process that the commits between <tt>v2.5</tt> included and <tt>v2.6</tt> included should be skipped.</p></div> <h3 id="_cutting_down_bisection_by_giving_more_parameters_to_bisect_start">Cutting down bisection by giving more parameters to bisect start</h3><div style="clear:left"></div> -<div class="para"><p>You can further cut down the number of trials, if you know what part of +<div class="paragraph"><p>You can further cut down the number of trials, if you know what part of the tree is involved in the problem you are tracking down, by specifying path parameters when issuing the <tt>bisect start</tt> command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect start -- arch/i386 include/asm-i386</tt></pre> </div></div> -<div class="para"><p>If you know beforehand more than one good commit, you can narrow the +<div class="paragraph"><p>If you know beforehand more than one good commit, you can narrow the bisect space down by specifying all of the good commits immediately after the bad commit when issuing the <tt>bisect start</tt> command:</p></div> <div class="listingblock"> @@ -489,28 +583,28 @@ # v2.6.20-rc4 and v2.6.20-rc1 are good</tt></pre> </div></div> <h3 id="_bisect_run">Bisect run</h3><div style="clear:left"></div> -<div class="para"><p>If you have a script that can tell if the current source code is good +<div class="paragraph"><p>If you have a script that can tell if the current source code is good or bad, you can bisect by issuing the command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git bisect run my_script arguments</tt></pre> </div></div> -<div class="para"><p>Note that the script (<tt>my_script</tt> in the above example) should +<div class="paragraph"><p>Note that the script (<tt>my_script</tt> in the above example) should exit with code 0 if the current source code is good, and exit with a code between 1 and 127 (inclusive), except 125, if the current source code is bad.</p></div> -<div class="para"><p>Any other exit code will abort the bisect process. It should be noted +<div class="paragraph"><p>Any other exit code will abort the bisect process. It should be noted that a program that terminates via "exit(-1)" leaves $? = 255, (see the exit(3) manual page), as the value is chopped with "& 0377".</p></div> -<div class="para"><p>The special exit code 125 should be used when the current source code +<div class="paragraph"><p>The special exit code 125 should be used when the current source code cannot be tested. If the script exits with this code, the current revision will be skipped (see <tt>git bisect skip</tt> above).</p></div> -<div class="para"><p>You may often find that during a bisect session you want to have +<div class="paragraph"><p>You may often find that during a bisect session you want to have temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or "revision that does not have this commit needs this patch applied to work around another problem this bisection is not interested in") applied to the revision being tested.</p></div> -<div class="para"><p>To cope with such a situation, after the inner <em>git bisect</em> finds the +<div class="paragraph"><p>To cope with such a situation, after the inner <em>git bisect</em> finds the next revision to test, the script can apply the patch before compiling, run the real test, and afterwards decide if the revision (possibly with the needed patch) passed the test and then @@ -520,7 +614,7 @@ </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Automatically bisect a broken build between v1.2 and HEAD: @@ -554,12 +648,12 @@ $ git bisect start v1.3 v1.1 -- # v1.3 is bad, v1.1 is good $ git bisect run ~/test.sh</tt></pre> </div></div> -<div class="para"><p>Here we use a "test.sh" custom script. In this script, if "make" +<div class="paragraph"><p>Here we use a "test.sh" custom script. In this script, if "make" fails, we skip the current commit.</p></div> -<div class="para"><p>It is safer to use a custom script outside the repository to prevent +<div class="paragraph"><p>It is safer to use a custom script outside the repository to prevent interactions between the bisect, make and test processes and the script.</p></div> -<div class="para"><p>"make test" should "exit 0", if the test suite passes, and +<div class="paragraph"><p>"make test" should "exit 0", if the test suite passes, and "exit 1" otherwise.</p></div> </li> <li> @@ -575,9 +669,9 @@ $ git bisect start HEAD HEAD~10 -- # culprit is among the last 10 $ git bisect run ~/test.sh</tt></pre> </div></div> -<div class="para"><p>Here "check_test_case.sh" should "exit 0" if the test case passes, +<div class="paragraph"><p>Here "check_test_case.sh" should "exit 0" if the test case passes, and "exit 1" otherwise.</p></div> -<div class="para"><p>It is safer if both "test.sh" and "check_test_case.sh" scripts are +<div class="paragraph"><p>It is safer if both "test.sh" and "check_test_case.sh" scripts are outside the repository to prevent interactions between the bisect, make and test processes and the scripts.</p></div> </li> @@ -590,30 +684,30 @@ <pre><tt>$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10 $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"</tt></pre> </div></div> -<div class="para"><p>Does the same as the previous example, but on a single line.</p></div> +<div class="paragraph"><p>Does the same as the previous example, but on a single line.</p></div> </li> </ul></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-bisect-lk2009.html">Fighting regressions with git bisect</a>, +<div class="paragraph"><p><a href="git-bisect-lk2009.html">Fighting regressions with git bisect</a>, <a href="git-blame.html">git-blame(1)</a>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:34 UTC +Last updated 2009-12-01 21:16:24 UTC </div> </div> </body> diff --git a/git-check-attr.html b/git-check-attr.html index a08509f..adac196 100644 --- a/git-check-attr.html +++ b/git-check-attr.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-check-attr(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-check-attr(1)</title> </head> <body> <div id="header"> @@ -318,21 +412,23 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git check-attr</em> attr… [--] pathname… -<em>git check-attr</em> --stdin [-z] attr… < <list-of-paths></div></div> +<div class="verseblock-content"><em>git check-attr</em> attr… [--] pathname… +<em>git check-attr</em> --stdin [-z] attr… < <list-of-paths></div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>For every pathname, this command will list if each attribute is <em>unspecified</em>, +<div class="paragraph"><p>For every pathname, this command will list if each attribute is <em>unspecified</em>, <em>set</em>, or <em>unset</em> as a gitattribute on that pathname.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --stdin </dt> <dd> @@ -340,7 +436,7 @@ Read file names from stdin instead of from the command-line. </p> </dd> -<dt> +<dt class="hdlist1"> -z </dt> <dd> @@ -349,7 +445,7 @@ NUL character instead of a linefeed character. </p> </dd> -<dt> +<dt class="hdlist1"> -- </dt> <dd> @@ -363,55 +459,55 @@ </div> <h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<div class="para"><p>The output is of the form: +<div class="paragraph"><p>The output is of the form: <path> COLON SP <attribute> COLON SP <info> LF</p></div> -<div class="para"><p><path> is the path of a file being queried, <attribute> is an attribute +<div class="paragraph"><p><path> is the path of a file being queried, <attribute> is an attribute being queried and <info> can be either:</p></div> -<div class="hlist"><table> -<tr> -<td class="hlist1"> +<div class="dlist"><dl> +<dt class="hdlist1"> <em>unspecified</em> -</td> -<td class="hlist2"> +</dt> +<dd> +<p> when the attribute is not defined for the path. -</td> -</tr> -<tr> -<td class="hlist1"> +</p> +</dd> +<dt class="hdlist1"> <em>unset</em> -</td> -<td class="hlist2"> +</dt> +<dd> +<p> when the attribute is defined as false. -</td> -</tr> -<tr> -<td class="hlist1"> +</p> +</dd> +<dt class="hdlist1"> <em>set</em> -</td> -<td class="hlist2"> +</dt> +<dd> +<p> when the attribute is defined as true. -</td> -</tr> -<tr> -<td class="hlist1"> +</p> +</dd> +<dt class="hdlist1"> <value> -</td> -<td class="hlist2"> +</dt> +<dd> +<p> when a value has been assigned to the attribute. -</td> -</tr> -</table></div> +</p> +</dd> +</dl></div> </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="para"><p>In the examples, the following <em>.gitattributes</em> file is used:</p></div> +<div class="paragraph"><p>In the examples, the following <em>.gitattributes</em> file is used:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>*.java diff=java -crlf myAttr NoMyAttr.java !myAttr README caveat=unspecified</tt></pre> </div></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Listing a single attribute: @@ -423,7 +519,7 @@ <pre><tt>$ git check-attr diff org/example/MyClass.java org/example/MyClass.java: diff: java</tt></pre> </div></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Listing multiple attributes for a file: @@ -437,7 +533,7 @@ org/example/MyClass.java: diff: java org/example/MyClass.java: myAttr: set</tt></pre> </div></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Listing an attribute for multiple files: @@ -450,7 +546,7 @@ org/example/MyClass.java: myAttr: set org/example/NoMyAttr.java: myAttr: unspecified</tt></pre> </div></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Not all values are equally unambiguous: @@ -465,23 +561,23 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="gitattributes.html">gitattributes(5)</a>.</p></div> +<div class="paragraph"><p><a href="gitattributes.html">gitattributes(5)</a>.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by James Bowes.</p></div> +<div class="paragraph"><p>Documentation by James Bowes.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:35 UTC +Last updated 2009-03-26 08:39:09 UTC </div> </div> </body> diff --git a/git-cherry.html b/git-cherry.html index 7c35640..20290de 100644 --- a/git-cherry.html +++ b/git-cherry.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-cherry(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-cherry(1)</title> </head> <body> <div id="header"> @@ -318,17 +412,17 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git cherry</em> [-v] [<upstream> [<head> [<limit>]]]</p></div> +<div class="paragraph"><p><em>git cherry</em> [-v] [<upstream> [<head> [<limit>]]]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>The changeset (or "diff") of each commit between the fork-point and <head> +<div class="paragraph"><p>The changeset (or "diff") of each commit between the fork-point and <head> is compared against each commit between the fork-point and <upstream>. The commits are compared with their <em>patch id</em>, obtained from the <em>git patch-id</em> program.</p></div> -<div class="para"><p>Every commit that doesn't exist in the <upstream> branch +<div class="paragraph"><p>Every commit that doesn’t exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the <upstream> branch are prefixed with a minus (-) sign, and those @@ -340,7 +434,7 @@ fork-point \__+__+__-__+__+__-__+__> <head></tt></pre> </div></div> -<div class="para"><p>If a <limit> has been given then the commits along the <head> branch up +<div class="paragraph"><p>If a <limit> has been given then the commits along the <head> branch up to and including <limit> are not reported:</p></div> <div class="literalblock"> <div class="content"> @@ -349,16 +443,16 @@ fork-point \__*__*__<limit>__-__+__> <head></tt></pre> </div></div> -<div class="para"><p>Because <em>git cherry</em> compares the changeset rather than the commit id +<div class="paragraph"><p>Because <em>git cherry</em> compares the changeset rather than the commit id (sha1), you can use <em>git cherry</em> to find out if a commit you made locally has been applied <upstream> under a different commit id. For example, -this will happen if you're feeding patches <upstream> via email rather +this will happen if you’re feeding patches <upstream> via email rather than pushing or pulling commits directly.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -v </dt> <dd> @@ -366,7 +460,7 @@ Verbose. </p> </dd> -<dt> +<dt class="hdlist1"> <upstream> </dt> <dd> @@ -375,7 +469,7 @@ Defaults to the first tracked remote branch, if available. </p> </dd> -<dt> +<dt class="hdlist1"> <head> </dt> <dd> @@ -383,7 +477,7 @@ Working branch; defaults to HEAD. </p> </dd> -<dt> +<dt class="hdlist1"> <limit> </dt> <dd> @@ -395,23 +489,23 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-patch-id.html">git-patch-id(1)</a></p></div> +<div class="paragraph"><p><a href="git-patch-id.html">git-patch-id(1)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:36 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-citool.html b/git-citool.html index ea2d1e3..c4ba708 100644 --- a/git-citool.html +++ b/git-citool.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-citool(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-citool(1)</title> </head> <body> <div id="header"> @@ -318,34 +412,34 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git citool</em></p></div> +<div class="paragraph"><p><em>git citool</em></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>A Tcl/Tk based graphical interface to review modified files, stage +<div class="paragraph"><p>A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch. This interface is an alternative to the less interactive <em>git commit</em> program.</p></div> -<div class="para"><p><em>git citool</em> is actually a standard alias for <tt>git gui citool</tt>. +<div class="paragraph"><p><em>git citool</em> is actually a standard alias for <tt>git gui citool</tt>. See <a href="git-gui.html">git-gui(1)</a> for more details.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Shawn O. Pearce <spearce@spearce.org>.</p></div> +<div class="paragraph"><p>Written by Shawn O. Pearce <<a href="mailto:spearce@spearce.org">spearce@spearce.org</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p></div> +<div class="paragraph"><p>Documentation by Shawn O. Pearce <<a href="mailto:spearce@spearce.org">spearce@spearce.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:36 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-clean.html b/git-clean.html index 87e6cd6..ceb859e 100644 --- a/git-clean.html +++ b/git-clean.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-clean(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-clean(1)</title> </head> <body> <div id="header"> @@ -318,25 +412,27 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git clean</em> [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>…</div></div> +<div class="verseblock-content"><em>git clean</em> [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>…</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Cleans the working tree by recursively removing files that are not +<div class="paragraph"><p>Cleans the working tree by recursively removing files that are not under version control, starting from the current directory.</p></div> -<div class="para"><p>Normally, only files unknown to git are removed, but if the <em>-x</em> +<div class="paragraph"><p>Normally, only files unknown to git are removed, but if the <em>-x</em> option is specified, ignored files are also removed. This can, for example, be useful to remove all build products.</p></div> -<div class="para"><p>If any optional <tt><path>…</tt> arguments are given, only those paths +<div class="paragraph"><p>If any optional <tt><path>…</tt> arguments are given, only those paths are affected.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -d </dt> <dd> @@ -347,10 +443,10 @@ if you really want to remove such a directory. </p> </dd> -<dt> +<dt class="hdlist1"> -f </dt> -<dt> +<dt class="hdlist1"> --force </dt> <dd> @@ -359,21 +455,21 @@ to false, <em>git clean</em> will refuse to run unless given -f or -n. </p> </dd> -<dt> +<dt class="hdlist1"> -n </dt> -<dt> +<dt class="hdlist1"> --dry-run </dt> <dd> <p> - Don't actually remove anything, just show what would be done. + Don’t actually remove anything, just show what would be done. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -382,10 +478,10 @@ successfully removed. </p> </dd> -<dt> +<dt class="hdlist1"> -e <pattern> </dt> -<dt> +<dt class="hdlist1"> --exclude=<pattern> </dt> <dd> @@ -395,18 +491,18 @@ given multiple times. </p> </dd> -<dt> +<dt class="hdlist1"> -x </dt> <dd> <p> - Don't use the ignore rules. This allows removing all untracked + Don’t use the ignore rules. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with <em>git reset</em>) to create a pristine working directory to test a clean build. </p> </dd> -<dt> +<dt class="hdlist1"> -X </dt> <dd> @@ -419,15 +515,15 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Pavel Roskin <proski@gnu.org></p></div> +<div class="paragraph"><p>Written by Pavel Roskin <<a href="mailto:proski@gnu.org">proski@gnu.org</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:36 UTC +Last updated 2010-08-18 22:14:44 UTC </div> </div> </body> diff --git a/git-count-objects.html b/git-count-objects.html index e4adeb9..4d6b3f2 100644 --- a/git-count-objects.html +++ b/git-count-objects.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-count-objects(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-count-objects(1)</title> </head> <body> <div id="header"> @@ -318,22 +412,22 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git count-objects</em> [-v]</p></div> +<div class="paragraph"><p><em>git count-objects</em> [-v]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This counts the number of unpacked object files and disk space consumed by +<div class="paragraph"><p>This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -v </dt> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -349,19 +443,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:38 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-cvsimport.html b/git-cvsimport.html index 3cd5863..58c0c07 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-cvsimport(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-cvsimport(1)</title> </head> <body> <div id="header"> @@ -318,30 +412,32 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git cvsimport</em> [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>] +<div class="verseblock-content"><em>git cvsimport</em> [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>] [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>] [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>] [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>] - [-r <remote>] [-R] [<CVS_module>]</div></div> + [-r <remote>] [-R] [<CVS_module>]</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Imports a CVS repository into git. It will either create a new +<div class="paragraph"><p>Imports a CVS repository into git. It will either create a new repository, or incrementally import into an existing one.</p></div> -<div class="para"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>. +<div class="paragraph"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>. At least version 2.1 is required.</p></div> -<div class="para"><p><strong>WARNING:</strong> for certain situations the import leads to incorrect results. +<div class="paragraph"><p><strong>WARNING:</strong> for certain situations the import leads to incorrect results. Please see the section <a href="#issues">ISSUES</a> for further reference.</p></div> -<div class="para"><p>You should <strong>never</strong> do any work of your own on the branches that are +<div class="paragraph"><p>You should <strong>never</strong> do any work of your own on the branches that are created by <em>git cvsimport</em>. By default initial import will create and populate a -"master" branch from the CVS repository's main branch which you're free +"master" branch from the CVS repository’s main branch which you’re free to work with; after that, you need to <em>git merge</em> incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via -r to separate and protect the incoming branches.</p></div> -<div class="para"><p>If you intend to set up a shared public repository that all developers can +<div class="paragraph"><p>If you intend to set up a shared public repository that all developers can read/write, or if you want to use <a href="git-cvsserver.html">git-cvsserver(1)</a>, then you probably want to make a bare clone of the imported repository, and use the clone as the shared repository. @@ -349,8 +445,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -v </dt> <dd> @@ -358,7 +454,7 @@ Verbosity: let <em>cvsimport</em> report what it is doing. </p> </dd> -<dt> +<dt class="hdlist1"> -d <CVSROOT> </dt> <dd> @@ -370,7 +466,7 @@ <tt>CVSROOT</tt> environment variable. </p> </dd> -<dt> +<dt class="hdlist1"> <CVS_module> </dt> <dd> @@ -380,16 +476,16 @@ <tt>CVS/Repository</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -C <target-dir> </dt> <dd> <p> - The git repository to import to. If the directory doesn't + The git repository to import to. If the directory doesn’t exist, it will be created. Default is the current directory. </p> </dd> -<dt> +<dt class="hdlist1"> -r <remote> </dt> <dd> @@ -399,7 +495,7 @@ akin to the way <em>git clone</em> uses <em>origin</em> by default. </p> </dd> -<dt> +<dt class="hdlist1"> -o <branch-for-HEAD> </dt> <dd> @@ -412,20 +508,20 @@ Use this option if you want to import into a different branch. </p> -<div class="para"><p>Use <em>-o master</em> for continuing an import that was initially done by +<div class="paragraph"><p>Use <em>-o master</em> for continuing an import that was initially done by the old cvs2git tool.</p></div> </dd> -<dt> +<dt class="hdlist1"> -i </dt> <dd> <p> - Import-only: don't perform a checkout after importing. This option + Import-only: don’t perform a checkout after importing. This option ensures the working directory and index remain untouched and will not create them if they do not exist. </p> </dd> -<dt> +<dt class="hdlist1"> -k </dt> <dd> @@ -435,7 +531,7 @@ to preserve compatibility with early imported trees. </p> </dd> -<dt> +<dt class="hdlist1"> -u </dt> <dd> @@ -443,7 +539,7 @@ Convert underscores in tag and branch names to dots. </p> </dd> -<dt> +<dt class="hdlist1"> -s <subst> </dt> <dd> @@ -451,7 +547,7 @@ Substitute the character "/" in branch names with <subst> </p> </dd> -<dt> +<dt class="hdlist1"> -p <options-for-cvsps> </dt> <dd> @@ -459,9 +555,9 @@ Additional options for cvsps. The options <em>-u</em> and <em>-A</em> are implicit and should not be used here. </p> -<div class="para"><p>If you need to pass multiple options, separate them with a comma.</p></div> +<div class="paragraph"><p>If you need to pass multiple options, separate them with a comma.</p></div> </dd> -<dt> +<dt class="hdlist1"> -z <fuzz> </dt> <dd> @@ -470,7 +566,7 @@ cvsps defaults to 300s. </p> </dd> -<dt> +<dt class="hdlist1"> -P <cvsps-output-file> </dt> <dd> @@ -479,7 +575,7 @@ for debugging or when cvsps is being handled outside cvsimport. </p> </dd> -<dt> +<dt class="hdlist1"> -m </dt> <dd> @@ -489,7 +585,7 @@ branch name from the commit message. </p> </dd> -<dt> +<dt class="hdlist1"> -M <regex> </dt> <dd> @@ -498,10 +594,10 @@ regex. It can be used with <em>-m</em> to enable the default regexes as well. You must escape forward slashes. </p> -<div class="para"><p>The regex must capture the source branch name in $1.</p></div> -<div class="para"><p>This option can be used several times to provide several detection regexes.</p></div> +<div class="paragraph"><p>The regex must capture the source branch name in $1.</p></div> +<div class="paragraph"><p>This option can be used several times to provide several detection regexes.</p></div> </dd> -<dt> +<dt class="hdlist1"> -S <regex> </dt> <dd> @@ -509,7 +605,7 @@ Skip paths matching the regex. </p> </dd> -<dt> +<dt class="hdlist1"> -a </dt> <dd> @@ -518,7 +614,7 @@ skips commits that have a timestamp less than 10 minutes ago. </p> </dd> -<dt> +<dt class="hdlist1"> -L <limit> </dt> <dd> @@ -527,7 +623,7 @@ cvsimport leaks memory. </p> </dd> -<dt> +<dt class="hdlist1"> -A <author-conv-file> </dt> <dd> @@ -539,20 +635,19 @@ <div class="listingblock"> <div class="content"> <pre><tt> exon=Andreas Ericsson <ae@op5.se> - spawn=Simon Pawn <spawn@frog-pond.org> -</tt></pre> + spawn=Simon Pawn <spawn@frog-pond.org></tt></pre> </div></div> -<div class="para"><p><em>git cvsimport</em> will make it appear as those authors had +<div class="paragraph"><p><em>git cvsimport</em> will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along.</p></div> -<div class="para"><p>For convenience, this data is saved to <tt>$GIT_DIR/cvs-authors</tt> +<div class="paragraph"><p>For convenience, this data is saved to <tt>$GIT_DIR/cvs-authors</tt> each time the <em>-A</em> option is provided and read from that same file each time <em>git cvsimport</em> is run.</p></div> -<div class="para"><p>It is not recommended to use this feature if you intend to +<div class="paragraph"><p>It is not recommended to use this feature if you intend to export changes back to CVS again later with <em>git cvsexportcommit</em>.</p></div> </dd> -<dt> +<dt class="hdlist1"> -R </dt> <dd> @@ -566,12 +661,12 @@ <div class="content"> <pre><tt>src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7</tt></pre> </div></div> -<div class="para"><p>The revision data is appended to the file if it already exists, for use when +<div class="paragraph"><p>The revision data is appended to the file if it already exists, for use when doing incremental imports.</p></div> -<div class="para"><p>This option may be useful if you have CVS revision numbers stored in commit +<div class="paragraph"><p>This option may be useful if you have CVS revision numbers stored in commit messages, bug-tracking systems, email archives, and the like.</p></div> </dd> -<dt> +<dt class="hdlist1"> -h </dt> <dd> @@ -583,14 +678,14 @@ </div> <h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<div class="para"><p>If <em>-v</em> is specified, the script reports what it is doing.</p></div> -<div class="para"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with +<div class="paragraph"><p>If <em>-v</em> is specified, the script reports what it is doing.</p></div> +<div class="paragraph"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with a zero exit status.</p></div> </div> <h2 id="issues">ISSUES</h2> <div class="sectionbody"> -<div class="para"><p>Problems related to timestamps:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Problems related to timestamps:</p></div> +<div class="ulist"><ul> <li> <p> If timestamps of commits in the CVS repository are not stable enough @@ -612,8 +707,8 @@ </p> </li> </ul></div> -<div class="para"><p>Problems related to branches:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Problems related to branches:</p></div> +<div class="ulist"><ul> <li> <p> Branches on which no commits have been made are not imported. @@ -633,18 +728,18 @@ </p> </li> </ul></div> -<div class="para"><p>Problems related to tags:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Problems related to tags:</p></div> +<div class="ulist"><ul> <li> <p> Multiple tags on the same revision are not imported. </p> </li> </ul></div> -<div class="para"><p>If you suspect that any of these issues may apply to the repository you +<div class="paragraph"><p>If you suspect that any of these issues may apply to the repository you want to import consider using these alternative tools which proved to be more stable in practice:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> cvs2git (part of cvs2svn), <tt>http://cvs2svn.tigris.org</tt> @@ -659,20 +754,20 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from -various participants of the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Written by Matthias Urlichs <<a href="mailto:smurf@smurf.noris.de">smurf@smurf.noris.de</a>>, with help from +various participants of the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Matthias Urlichs <smurf@smurf.noris.de>.</p></div> +<div class="paragraph"><p>Documentation by Matthias Urlichs <<a href="mailto:smurf@smurf.noris.de">smurf@smurf.noris.de</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:38 UTC +Last updated 2010-08-18 22:14:44 UTC </div> </div> </body> diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 8d4b842..b9a79ca 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-fetch-pack(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-fetch-pack(1)</title> </head> <body> <div id="header"> @@ -318,27 +412,27 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git fetch-pack</em> [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>…]</p></div> +<div class="paragraph"><p><em>git fetch-pack</em> [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>…]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Usually you would want to use <em>git fetch</em>, which is a +<div class="paragraph"><p>Usually you would want to use <em>git fetch</em>, which is a higher level wrapper of this command, instead.</p></div> -<div class="para"><p>Invokes <em>git-upload-pack</em> on a possibly remote repository +<div class="paragraph"><p>Invokes <em>git-upload-pack</em> on a possibly remote repository and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally is found out by scanning the local refs/ hierarchy and sent to <em>git-upload-pack</em> running on the other end.</p></div> -<div class="para"><p>This command degenerates to download everything to complete the +<div class="paragraph"><p>This command degenerates to download everything to complete the asked refs from the remote side when the local side does not have a common ancestor commit.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --all </dt> <dd> @@ -346,10 +440,10 @@ Fetch all remote refs. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -358,10 +452,10 @@ cloning process less verbose. </p> </dd> -<dt> +<dt class="hdlist1"> -k </dt> -<dt> +<dt class="hdlist1"> --keep </dt> <dd> @@ -372,7 +466,7 @@ locked against repacking. </p> </dd> -<dt> +<dt class="hdlist1"> --thin </dt> <dd> @@ -381,7 +475,7 @@ on objects not included in the pack to reduce network traffic. </p> </dd> -<dt> +<dt class="hdlist1"> --include-tag </dt> <dd> @@ -392,14 +486,14 @@ otherwise determine the tags this option made available. </p> </dd> -<dt> +<dt class="hdlist1"> --upload-pack=<git-upload-pack> </dt> <dd> <p> Use this to specify the path to <em>git-upload-pack</em> on the remote side, if is not found on your $PATH. - Installations of sshd ignores the user's environment + Installations of sshd ignores the user’s environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set @@ -409,7 +503,7 @@ the things up in .bash_profile). </p> </dd> -<dt> +<dt class="hdlist1"> --exec=<git-upload-pack> </dt> <dd> @@ -417,7 +511,7 @@ Same as --upload-pack=<git-upload-pack>. </p> </dd> -<dt> +<dt class="hdlist1"> --depth=<n> </dt> <dd> @@ -425,7 +519,7 @@ Limit fetching to ancestor-chains not longer than n. </p> </dd> -<dt> +<dt class="hdlist1"> --no-progress </dt> <dd> @@ -433,7 +527,7 @@ Do not show the progress. </p> </dd> -<dt> +<dt class="hdlist1"> -v </dt> <dd> @@ -441,7 +535,7 @@ Run verbosely. </p> </dd> -<dt> +<dt class="hdlist1"> <host> </dt> <dd> @@ -451,7 +545,7 @@ ssh. </p> </dd> -<dt> +<dt class="hdlist1"> <directory> </dt> <dd> @@ -459,7 +553,7 @@ The repository to sync from. </p> </dd> -<dt> +<dt class="hdlist1"> <refs>… </dt> <dd> @@ -473,19 +567,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:42 UTC +Last updated 2010-02-19 09:57:41 UTC </div> </div> </body> diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 523733c..aa8dcb0 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-fsck-objects(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-fsck-objects(1)</title> </head> <body> <div id="header"> @@ -318,18 +412,18 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git fsck-objects</em> …</p></div> +<div class="paragraph"><p><em>git fsck-objects</em> …</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This is a synonym for <a href="git-fsck.html">git-fsck(1)</a>. Please refer to the +<div class="paragraph"><p>This is a synonym for <a href="git-fsck.html">git-fsck(1)</a>. Please refer to the documentation of that command.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:44 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 0ebc834..b0625b2 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-get-tar-commit-id(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-get-tar-commit-id(1)</title> </head> <body> <div id="header"> @@ -318,35 +412,35 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git get-tar-commit-id</em> < <tarfile></p></div> +<div class="paragraph"><p><em>git get-tar-commit-id</em> < <tarfile></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Acts as a filter, extracting the commit ID stored in archives created by +<div class="paragraph"><p>Acts as a filter, extracting the commit ID stored in archives created by <em>git archive</em>. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of <tarfile> very much.</p></div> -<div class="para"><p>If no commit ID is found, <em>git get-tar-commit-id</em> quietly exists with a +<div class="paragraph"><p>If no commit ID is found, <em>git get-tar-commit-id</em> quietly exists with a return code of 1. This can happen if <tarfile> had not been created using <em>git archive</em> or if the first parameter of <em>git archive</em> had been a tree ID instead of a commit ID or tag.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Rene Scharfe <rene.scharfe@lsrfire.ath.cx></p></div> +<div class="paragraph"><p>Written by Rene Scharfe <<a href="mailto:rene.scharfe@lsrfire.ath.cx">rene.scharfe@lsrfire.ath.cx</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:44 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-grep.html b/git-grep.html index e842e72..88615fd 100644 --- a/git-grep.html +++ b/git-grep.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-grep(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-grep(1)</title> </head> <body> <div id="header"> @@ -318,10 +412,10 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git grep</em> [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] +<div class="verseblock-content"><em>git grep</em> [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] [-v | --invert-match] [-h|-H] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] @@ -335,17 +429,19 @@ [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>…] [--cached | --no-index | <tree>…] - [--] [<pathspec>…]</div></div> + [--] [<pathspec>…]</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Look for specified patterns in the tracked files in the work tree, blobs +<div class="paragraph"><p>Look for specified patterns in the tracked files in the work tree, blobs registered in the index file, or blobs in given tree objects.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --cached </dt> <dd> @@ -354,7 +450,7 @@ blobs registered in the index file. </p> </dd> -<dt> +<dt class="hdlist1"> --no-index </dt> <dd> @@ -362,10 +458,10 @@ Search files in the current directory, not just those tracked by git. </p> </dd> -<dt> +<dt class="hdlist1"> -a </dt> -<dt> +<dt class="hdlist1"> --text </dt> <dd> @@ -373,10 +469,10 @@ Process binary files as if they were text. </p> </dd> -<dt> +<dt class="hdlist1"> -i </dt> -<dt> +<dt class="hdlist1"> --ignore-case </dt> <dd> @@ -385,15 +481,15 @@ files. </p> </dd> -<dt> +<dt class="hdlist1"> -I </dt> <dd> <p> - Don't match the pattern in binary files. + Don’t match the pattern in binary files. </p> </dd> -<dt> +<dt class="hdlist1"> --max-depth <depth> </dt> <dd> @@ -402,10 +498,10 @@ levels of directories. A negative value means no limit. </p> </dd> -<dt> +<dt class="hdlist1"> -w </dt> -<dt> +<dt class="hdlist1"> --word-regexp </dt> <dd> @@ -415,10 +511,10 @@ the end of a line or followed by a non-word character). </p> </dd> -<dt> +<dt class="hdlist1"> -v </dt> -<dt> +<dt class="hdlist1"> --invert-match </dt> <dd> @@ -426,10 +522,10 @@ Select non-matching lines. </p> </dd> -<dt> +<dt class="hdlist1"> -h </dt> -<dt> +<dt class="hdlist1"> -H </dt> <dd> @@ -441,7 +537,7 @@ line. </p> </dd> -<dt> +<dt class="hdlist1"> --full-name </dt> <dd> @@ -452,16 +548,16 @@ top directory. </p> </dd> -<dt> +<dt class="hdlist1"> -E </dt> -<dt> +<dt class="hdlist1"> --extended-regexp </dt> -<dt> +<dt class="hdlist1"> -G </dt> -<dt> +<dt class="hdlist1"> --basic-regexp </dt> <dd> @@ -470,19 +566,19 @@ is to use basic regexp. </p> </dd> -<dt> +<dt class="hdlist1"> -F </dt> -<dt> +<dt class="hdlist1"> --fixed-strings </dt> <dd> <p> - Use fixed strings for patterns (don't interpret pattern + Use fixed strings for patterns (don’t interpret pattern as a regex). </p> </dd> -<dt> +<dt class="hdlist1"> -n </dt> <dd> @@ -490,19 +586,19 @@ Prefix the line number to matching lines. </p> </dd> -<dt> +<dt class="hdlist1"> -l </dt> -<dt> +<dt class="hdlist1"> --files-with-matches </dt> -<dt> +<dt class="hdlist1"> --name-only </dt> -<dt> +<dt class="hdlist1"> -L </dt> -<dt> +<dt class="hdlist1"> --files-without-match </dt> <dd> @@ -513,10 +609,10 @@ synonym for <tt>--files-with-matches</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -O [<pager>] </dt> -<dt> +<dt class="hdlist1"> --open-files-in-pager [<pager>] </dt> <dd> @@ -527,10 +623,10 @@ the first match automatically. </p> </dd> -<dt> +<dt class="hdlist1"> -z </dt> -<dt> +<dt class="hdlist1"> --null </dt> <dd> @@ -539,10 +635,10 @@ file name. </p> </dd> -<dt> +<dt class="hdlist1"> -c </dt> -<dt> +<dt class="hdlist1"> --count </dt> <dd> @@ -551,7 +647,7 @@ lines that match. </p> </dd> -<dt> +<dt class="hdlist1"> --color[=<when>] </dt> <dd> @@ -560,7 +656,7 @@ The value must be always (the default), never, or auto. </p> </dd> -<dt> +<dt class="hdlist1"> --no-color </dt> <dd> @@ -570,18 +666,18 @@ Same as <tt>--color=never</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -[ABC] <context> </dt> <dd> <p> - Show <tt>context</tt> trailing (<tt>A</tt> — after), or leading (<tt>B</tt> - — before), or both (<tt>C</tt> — context) lines, and place a + Show <tt>context</tt> trailing (<tt>A</tt> — after), or leading (<tt>B</tt> +  — before), or both (<tt>C</tt> — context) lines, and place a line containing <tt>--</tt> between contiguous groups of matches. </p> </dd> -<dt> +<dt class="hdlist1"> -<num> </dt> <dd> @@ -589,10 +685,10 @@ A shortcut for specifying <tt>-C<num></tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -p </dt> -<dt> +<dt class="hdlist1"> --show-function </dt> <dd> @@ -604,7 +700,7 @@ <a href="gitattributes.html">gitattributes(5)</a>). </p> </dd> -<dt> +<dt class="hdlist1"> -f <file> </dt> <dd> @@ -612,7 +708,7 @@ Read patterns from <file>, one per line. </p> </dd> -<dt> +<dt class="hdlist1"> -e </dt> <dd> @@ -623,16 +719,16 @@ combined by <em>or</em>. </p> </dd> -<dt> +<dt class="hdlist1"> --and </dt> -<dt> +<dt class="hdlist1"> --or </dt> -<dt> +<dt class="hdlist1"> --not </dt> -<dt> +<dt class="hdlist1"> ( … ) </dt> <dd> @@ -643,7 +739,7 @@ patterns. </p> </dd> -<dt> +<dt class="hdlist1"> --all-match </dt> <dd> @@ -653,19 +749,19 @@ have lines to match all of them. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> <p> Do not output matched lines; instead, exit with status 0 when - there is a match and with non-zero status when there isn't. + there is a match and with non-zero status when there isn’t. </p> </dd> -<dt> +<dt class="hdlist1"> <tree>… </dt> <dd> @@ -674,7 +770,7 @@ blobs in the given trees. </p> </dd> -<dt> +<dt class="hdlist1"> -- </dt> <dd> @@ -683,7 +779,7 @@ are <pathspec> limiters. </p> </dd> -<dt> +<dt class="hdlist1"> <pathspec>… </dt> <dd> @@ -696,8 +792,8 @@ </div> <h2 id="_examples">Examples</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> git grep 'time_t' -- '*.[ch]' </dt> <dd> @@ -706,7 +802,7 @@ directory and its subdirectories. </p> </dd> -<dt> +<dt class="hdlist1"> git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \) </dt> <dd> @@ -715,7 +811,7 @@ <tt>PATH_MAX</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> git grep --all-match -e NODE -e Unexpected </dt> <dd> @@ -728,20 +824,20 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Originally written by Linus Torvalds <torvalds@osdl.org>, later +<div class="paragraph"><p>Originally written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>>, later revamped by Junio C Hamano.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:45 UTC +Last updated 2010-09-03 21:29:54 UTC </div> </div> </body> diff --git a/git-gui.html b/git-gui.html index b6e2e9b..45e1af1 100644 --- a/git-gui.html +++ b/git-gui.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-gui(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-gui(1)</title> </head> <body> <div id="header"> @@ -318,29 +412,29 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git gui</em> [<command>] [arguments]</p></div> +<div class="paragraph"><p><em>git gui</em> [<command>] [arguments]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>A Tcl/Tk based graphical user interface to Git. <em>git gui</em> focuses +<div class="paragraph"><p>A Tcl/Tk based graphical user interface to Git. <em>git gui</em> focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories.</p></div> -<div class="para"><p>Unlike <em>gitk</em>, <em>git gui</em> focuses on commit generation +<div class="paragraph"><p>Unlike <em>gitk</em>, <em>git gui</em> focuses on commit generation and single file annotation and does not show project history. It does however supply menu actions to start a <em>gitk</em> session from within <em>git gui</em>.</p></div> -<div class="para"><p><em>git gui</em> is known to work on all popular UNIX systems, Mac OS X, +<div class="paragraph"><p><em>git gui</em> is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS). To the extent possible OS specific user interface guidelines are followed, making <em>git gui</em> a fairly native interface for users.</p></div> </div> <h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> blame </dt> <dd> @@ -349,7 +443,7 @@ version (or working directory if not specified). </p> </dd> -<dt> +<dt class="hdlist1"> browser </dt> <dd> @@ -359,18 +453,18 @@ browser are opened in the blame viewer. </p> </dd> -<dt> +<dt class="hdlist1"> citool </dt> <dd> <p> Start <em>git gui</em> and arrange to make exactly one commit before exiting and returning to the shell. The interface is limited - to only commit actions, slightly reducing the application's + to only commit actions, slightly reducing the application’s startup time and simplifying the menubar. </p> </dd> -<dt> +<dt class="hdlist1"> version </dt> <dd> @@ -382,8 +476,8 @@ </div> <h2 id="_examples">Examples</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> git gui blame Makefile </dt> <dd> @@ -396,7 +490,7 @@ <em>Not Yet Committed</em>. </p> </dd> -<dt> +<dt class="hdlist1"> git gui blame v0.99.8 Makefile </dt> <dd> @@ -407,7 +501,7 @@ the working directory. </p> </dd> -<dt> +<dt class="hdlist1"> git gui blame --line=100 Makefile </dt> <dd> @@ -416,7 +510,7 @@ scrolls the view to center on line <em>100</em>. </p> </dd> -<dt> +<dt class="hdlist1"> git gui citool </dt> <dd> @@ -426,7 +520,7 @@ closed in any way other than by making a commit. </p> </dd> -<dt> +<dt class="hdlist1"> git gui citool --amend </dt> <dd> @@ -435,7 +529,7 @@ the interface. </p> </dd> -<dt> +<dt class="hdlist1"> git gui citool --nocommit </dt> <dd> @@ -446,7 +540,7 @@ you can use it as a GUI version of <a href="git-mergetool.html">git-mergetool(1)</a> </p> </dd> -<dt> +<dt class="hdlist1"> git citool </dt> <dd> @@ -454,7 +548,7 @@ Same as <tt>git gui citool</tt> (above). </p> </dd> -<dt> +<dt class="hdlist1"> git gui browser maint </dt> <dd> @@ -468,8 +562,8 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <a href="gitk.html">gitk(1)</a> </dt> <dd> @@ -483,36 +577,36 @@ </div> <h2 id="_other">Other</h2> <div class="sectionbody"> -<div class="para"><p><em>git gui</em> is actually maintained as an independent project, but stable +<div class="paragraph"><p><em>git gui</em> is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convenience of end users.</p></div> -<div class="para"><p>A <em>git gui</em> development repository can be obtained from:</p></div> +<div class="paragraph"><p>A <em>git gui</em> development repository can be obtained from:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git clone git://repo.or.cz/git-gui.git</tt></pre> </div></div> -<div class="para"><p>or</p></div> +<div class="paragraph"><p>or</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git clone http://repo.or.cz/r/git-gui.git</tt></pre> </div></div> -<div class="para"><p>or browsed online at <a href="http://repo.or.cz/w/git-gui.git/">http://repo.or.cz/w/git-gui.git/</a>.</p></div> +<div class="paragraph"><p>or browsed online at <a href="http://repo.or.cz/w/git-gui.git/">http://repo.or.cz/w/git-gui.git/</a>.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Shawn O. Pearce <spearce@spearce.org>.</p></div> +<div class="paragraph"><p>Written by Shawn O. Pearce <<a href="mailto:spearce@spearce.org">spearce@spearce.org</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p></div> +<div class="paragraph"><p>Documentation by Shawn O. Pearce <<a href="mailto:spearce@spearce.org">spearce@spearce.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:45 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-hash-object.html b/git-hash-object.html index 184ba2f..c3a181c 100644 --- a/git-hash-object.html +++ b/git-hash-object.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-hash-object(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-hash-object(1)</title> </head> <body> <div id="header"> @@ -318,15 +412,17 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git hash-object</em> [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>… -<em>git hash-object</em> [-t <type>] [-w] --stdin-paths [--no-filters] < <list-of-paths></div></div> +<div class="verseblock-content"><em>git hash-object</em> [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>… +<em>git hash-object</em> [-t <type>] [-w] --stdin-paths [--no-filters] < <list-of-paths></div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Computes the object ID value for an object with specified type +<div class="paragraph"><p>Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. @@ -336,8 +432,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -t <type> </dt> <dd> @@ -345,7 +441,7 @@ Specify the type (default: "blob"). </p> </dd> -<dt> +<dt class="hdlist1"> -w </dt> <dd> @@ -353,7 +449,7 @@ Actually write the object into the object database. </p> </dd> -<dt> +<dt class="hdlist1"> --stdin </dt> <dd> @@ -361,7 +457,7 @@ Read the object from standard input instead of from a file. </p> </dd> -<dt> +<dt class="hdlist1"> --stdin-paths </dt> <dd> @@ -369,7 +465,7 @@ Read file names from stdin instead of from the command-line. </p> </dd> -<dt> +<dt class="hdlist1"> --path </dt> <dd> @@ -384,7 +480,7 @@ read from stdin. </p> </dd> -<dt> +<dt class="hdlist1"> --no-filters </dt> <dd> @@ -399,19 +495,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:45 UTC +Last updated 2010-08-18 22:14:44 UTC </div> </div> </body> diff --git a/git-help.html b/git-help.html index 0871757..30aeb4a 100644 --- a/git-help.html +++ b/git-help.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-help(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-help(1)</title> </head> <body> <div id="header"> @@ -318,30 +412,30 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git help</em> [-a|--all|-i|--info|-m|--man|-w|--web] [COMMAND]</p></div> +<div class="paragraph"><p><em>git help</em> [-a|--all|-i|--info|-m|--man|-w|--web] [COMMAND]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>With no options and no COMMAND given, the synopsis of the <em>git</em> +<div class="paragraph"><p>With no options and no COMMAND given, the synopsis of the <em>git</em> command and a list of the most commonly used git commands are printed on the standard output.</p></div> -<div class="para"><p>If the option <em>--all</em> or <em>-a</em> is given, then all available commands are +<div class="paragraph"><p>If the option <em>--all</em> or <em>-a</em> is given, then all available commands are printed on the standard output.</p></div> -<div class="para"><p>If a git command is named, a manual page for that command is brought +<div class="paragraph"><p>If a git command is named, a manual page for that command is brought up. The <em>man</em> program is used by default for this purpose, but this can be overridden by other options or configuration variables.</p></div> -<div class="para"><p>Note that <tt>git --help …</tt> is identical to <tt>git help …</tt> because the +<div class="paragraph"><p>Note that <tt>git --help …</tt> is identical to <tt>git help …</tt> because the former is internally converted into the latter.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -a </dt> -<dt> +<dt class="hdlist1"> --all </dt> <dd> @@ -350,10 +444,10 @@ option supersedes any other option. </p> </dd> -<dt> +<dt class="hdlist1"> -i </dt> -<dt> +<dt class="hdlist1"> --info </dt> <dd> @@ -362,10 +456,10 @@ <em>info</em> program will be used for that purpose. </p> </dd> -<dt> +<dt class="hdlist1"> -m </dt> -<dt> +<dt class="hdlist1"> --man </dt> <dd> @@ -374,14 +468,14 @@ option may be used to override a value set in the <em>help.format</em> configuration variable. </p> -<div class="para"><p>By default the <em>man</em> program will be used to display the manual page, +<div class="paragraph"><p>By default the <em>man</em> program will be used to display the manual page, but the <em>man.viewer</em> configuration variable may be used to choose other display programs (see below).</p></div> </dd> -<dt> +<dt class="hdlist1"> -w </dt> -<dt> +<dt class="hdlist1"> --web </dt> <dd> @@ -389,7 +483,7 @@ Display manual page for the command in the <em>web</em> (HTML) format. A web browser will be used for that purpose. </p> -<div class="para"><p>The web browser can be specified using the configuration variable +<div class="paragraph"><p>The web browser can be specified using the configuration variable <em>help.browser</em>, or <em>web.browser</em> if the former is not set. If none of these config variables is set, the <em>git web--browse</em> helper script (called by <em>git help</em>) will pick a suitable default. See @@ -400,11 +494,11 @@ <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2> <div class="sectionbody"> <h3 id="_help_format">help.format</h3><div style="clear:left"></div> -<div class="para"><p>If no command line option is passed, the <em>help.format</em> configuration +<div class="paragraph"><p>If no command line option is passed, the <em>help.format</em> configuration variable will be checked. The following values are supported for this variable; they make <em>git help</em> behave as their corresponding command line option:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> "man" corresponds to <em>-m|--man</em>, @@ -422,14 +516,14 @@ </li> </ul></div> <h3 id="_help_browser_web_browser_and_browser_lt_tool_gt_path">help.browser, web.browser and browser.<tool>.path</h3><div style="clear:left"></div> -<div class="para"><p>The <em>help.browser</em>, <em>web.browser</em> and <em>browser.<tool>.path</em> will also +<div class="paragraph"><p>The <em>help.browser</em>, <em>web.browser</em> and <em>browser.<tool>.path</em> will also be checked if the <em>web</em> format is chosen (either by command line option or configuration variable). See <em>-w|--web</em> in the OPTIONS section above and <a href="git-web--browse.html">git-web--browse(1)</a>.</p></div> <h3 id="_man_viewer">man.viewer</h3><div style="clear:left"></div> -<div class="para"><p>The <em>man.viewer</em> config variable will be checked if the <em>man</em> format +<div class="paragraph"><p>The <em>man.viewer</em> config variable will be checked if the <em>man</em> format is chosen. The following values are currently supported:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> "man": use the <em>man</em> program as usual, @@ -448,44 +542,44 @@ </p> </li> </ul></div> -<div class="para"><p>Values for other tools can be used if there is a corresponding +<div class="paragraph"><p>Values for other tools can be used if there is a corresponding <em>man.<tool>.cmd</em> configuration entry (see below).</p></div> -<div class="para"><p>Multiple values may be given to the <em>man.viewer</em> configuration +<div class="paragraph"><p>Multiple values may be given to the <em>man.viewer</em> configuration variable. Their corresponding programs will be tried in the order listed in the configuration file.</p></div> -<div class="para"><p>For example, this configuration:</p></div> +<div class="paragraph"><p>For example, this configuration:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [man] viewer = konqueror viewer = woman</tt></pre> </div></div> -<div class="para"><p>will try to use konqueror first. But this may fail (for example if +<div class="paragraph"><p>will try to use konqueror first. But this may fail (for example if DISPLAY is not set) and in that case emacs' woman mode will be tried.</p></div> -<div class="para"><p>If everything fails, or if no viewer is configured, the viewer specified +<div class="paragraph"><p>If everything fails, or if no viewer is configured, the viewer specified in the GIT_MAN_VIEWER environment variable will be tried. If that fails too, the <em>man</em> program will be tried anyway.</p></div> <h3 id="_man_lt_tool_gt_path">man.<tool>.path</h3><div style="clear:left"></div> -<div class="para"><p>You can explicitly provide a full path to your preferred man viewer by +<div class="paragraph"><p>You can explicitly provide a full path to your preferred man viewer by setting the configuration variable <em>man.<tool>.path</em>. For example, you can configure the absolute path to konqueror by setting <em>man.konqueror.path</em>. Otherwise, <em>git help</em> assumes the tool is available in PATH.</p></div> <h3 id="_man_lt_tool_gt_cmd">man.<tool>.cmd</h3><div style="clear:left"></div> -<div class="para"><p>When the man viewer, specified by the <em>man.viewer</em> configuration +<div class="paragraph"><p>When the man viewer, specified by the <em>man.viewer</em> configuration variables, is not among the supported ones, then the corresponding <em>man.<tool>.cmd</em> configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man page passed as arguments.</p></div> <h3 id="_note_about_konqueror">Note about konqueror</h3><div style="clear:left"></div> -<div class="para"><p>When <em>konqueror</em> is specified in the <em>man.viewer</em> configuration +<div class="paragraph"><p>When <em>konqueror</em> is specified in the <em>man.viewer</em> configuration variable, we launch <em>kfmclient</em> to try to open the man page on an already opened konqueror in a new tab if possible.</p></div> -<div class="para"><p>For consistency, we also try such a trick if <em>man.konqueror.path</em> is +<div class="paragraph"><p>For consistency, we also try such a trick if <em>man.konqueror.path</em> is set to something like <em>A_PATH_TO/konqueror</em>. That means we will try to launch <em>A_PATH_TO/kfmclient</em> instead.</p></div> -<div class="para"><p>If you really want to use <em>konqueror</em>, then you can use something like +<div class="paragraph"><p>If you really want to use <em>konqueror</em>, then you can use something like the following:</p></div> <div class="listingblock"> <div class="content"> @@ -496,34 +590,34 @@ cmd = A_PATH_TO/konqueror</tt></pre> </div></div> <h3 id="_note_about_git_config_global">Note about git config --global</h3><div style="clear:left"></div> -<div class="para"><p>Note that all these configuration variables should probably be set +<div class="paragraph"><p>Note that all these configuration variables should probably be set using the <em>--global</em> flag, for example like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git config --global help.format web $ git config --global web.browser firefox</tt></pre> </div></div> -<div class="para"><p>as they are probably more user specific than repository specific. +<div class="paragraph"><p>as they are probably more user specific than repository specific. See <a href="git-config.html">git-config(1)</a> for more information about this.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com> and the git-list -<git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> and the git-list +<<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Initial documentation was part of the <a href="git.html">git(1)</a> man page. -Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a -little. Maintenance is done by the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Initial documentation was part of the <a href="git.html">git(1)</a> man page. +Christian Couder <<a href="mailto:chriscool@tuxfamily.org">chriscool@tuxfamily.org</a>> extracted and rewrote it a +little. Maintenance is done by the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:45 UTC +Last updated 2010-09-03 21:29:54 UTC </div> </div> </body> diff --git a/git-http-backend.html b/git-http-backend.html index 21fd06f..25c5d1f 100644 --- a/git-http-backend.html +++ b/git-http-backend.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-http-backend(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-http-backend(1)</title> </head> <body> <div id="header"> @@ -318,23 +412,25 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git http-backend</em></div></div> +<div class="verseblock-content"><em>git http-backend</em></div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>A simple CGI program to serve the contents of a Git repository to Git +<div class="paragraph"><p>A simple CGI program to serve the contents of a Git repository to Git clients accessing the repository over http:// and https:// protocols. The program supports clients fetching using both the smart HTTP protocol and the backwards-compatible dumb HTTP protocol, as well as clients pushing using the smart HTTP protocol.</p></div> -<div class="para"><p>It verifies that the directory has the magic file +<div class="paragraph"><p>It verifies that the directory has the magic file "git-daemon-export-ok", and it will refuse to export any git directory -that hasn't explicitly been marked for export this way (unless the +that hasn’t explicitly been marked for export this way (unless the GIT_HTTP_EXPORT_ALL environmental variable is set).</p></div> -<div class="para"><p>By default, only the <tt>upload-pack</tt> service is enabled, which serves +<div class="paragraph"><p>By default, only the <tt>upload-pack</tt> service is enabled, which serves <em>git fetch-pack</em> and <em>git ls-remote</em> clients, which are invoked from <em>git fetch</em>, <em>git pull</em>, and <em>git clone</em>. If the client is authenticated, the <tt>receive-pack</tt> service is enabled, which serves <em>git send-pack</em> @@ -342,10 +438,10 @@ </div> <h2 id="_services">SERVICES</h2> <div class="sectionbody"> -<div class="para"><p>These services can be enabled/disabled using the per-repository +<div class="paragraph"><p>These services can be enabled/disabled using the per-repository configuration file:</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> http.getanyfile </dt> <dd> @@ -358,7 +454,7 @@ by setting this configuration item to <tt>false</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> http.uploadpack </dt> <dd> @@ -368,7 +464,7 @@ by setting this configuration item to <tt>false</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> http.receivepack </dt> <dd> @@ -384,7 +480,7 @@ </div> <h2 id="_url_translation">URL TRANSLATION</h2> <div class="sectionbody"> -<div class="para"><p>To determine the location of the repository on disk, <em>git http-backend</em> +<div class="paragraph"><p>To determine the location of the repository on disk, <em>git http-backend</em> concatenates the environment variables PATH_INFO, which is set automatically by the web server, and GIT_PROJECT_ROOT, which must be set manually in the web server configuration. If GIT_PROJECT_ROOT is not @@ -393,10 +489,10 @@ </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="para"><p>All of the following examples map <em>http://$hostname/git/foo/bar.git</em> +<div class="paragraph"><p>All of the following examples map <em>http://$hostname/git/foo/bar.git</em> to <em>/var/www/git/foo/bar.git</em>.</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> Apache 2.x </dt> <dd> @@ -411,7 +507,7 @@ SetEnv GIT_HTTP_EXPORT_ALL ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/</tt></pre> </div></div> -<div class="para"><p>To enable anonymous read access but authenticated write access, +<div class="paragraph"><p>To enable anonymous read access but authenticated write access, require authorization with a LocationMatch directive:</p></div> <div class="listingblock"> <div class="content"> @@ -422,7 +518,7 @@ ... </LocationMatch></tt></pre> </div></div> -<div class="para"><p>To require authentication for both reads and writes, use a Location +<div class="paragraph"><p>To require authentication for both reads and writes, use a Location directive around the repository, or one of its parent directories:</p></div> <div class="listingblock"> <div class="content"> @@ -433,7 +529,7 @@ ... </Location></tt></pre> </div></div> -<div class="para"><p>To serve gitweb at the same url, use a ScriptAliasMatch to only +<div class="paragraph"><p>To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs that <em>git http-backend</em> can handle, and forward the rest to gitweb:</p></div> <div class="listingblock"> @@ -450,7 +546,7 @@ ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> Accelerated static Apache 2.x </dt> <dd> @@ -468,7 +564,7 @@ AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1 ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/</tt></pre> </div></div> -<div class="para"><p>This can be combined with the gitweb configuration:</p></div> +<div class="paragraph"><p>This can be combined with the gitweb configuration:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>SetEnv GIT_PROJECT_ROOT /var/www/git @@ -488,9 +584,9 @@ </div> <h2 id="_environment">ENVIRONMENT</h2> <div class="sectionbody"> -<div class="para"><p><em>git http-backend</em> relies upon the CGI environment variables set +<div class="paragraph"><p><em>git http-backend</em> relies upon the CGI environment variables set by the invoking web server, including:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> PATH_INFO (if GIT_PROJECT_ROOT is set, otherwise PATH_TRANSLATED) @@ -522,31 +618,31 @@ </p> </li> </ul></div> -<div class="para"><p>The GIT_HTTP_EXPORT_ALL environmental variable may be passed to +<div class="paragraph"><p>The GIT_HTTP_EXPORT_ALL environmental variable may be passed to <em>git-http-backend</em> to bypass the check for the "git-daemon-export-ok" file in each repository before allowing export of that repository.</p></div> -<div class="para"><p>The backend process sets GIT_COMMITTER_NAME to <em>$REMOTE_USER</em> and +<div class="paragraph"><p>The backend process sets GIT_COMMITTER_NAME to <em>$REMOTE_USER</em> and GIT_COMMITTER_EMAIL to <em>${REMOTE_USER}@http.${REMOTE_ADDR}</em>, ensuring that any reflogs created by <em>git-receive-pack</em> contain some identifying information of the remote user who performed the push.</p></div> -<div class="para"><p>All CGI environment variables are available to each of the hooks +<div class="paragraph"><p>All CGI environment variables are available to each of the hooks invoked by the <em>git-receive-pack</em>.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Shawn O. Pearce <spearce@spearce.org>.</p></div> +<div class="paragraph"><p>Written by Shawn O. Pearce <<a href="mailto:spearce@spearce.org">spearce@spearce.org</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Shawn O. Pearce <spearce@spearce.org>.</p></div> +<div class="paragraph"><p>Documentation by Shawn O. Pearce <<a href="mailto:spearce@spearce.org">spearce@spearce.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:45 UTC +Last updated 2010-04-01 04:48:58 UTC </div> </div> </body> diff --git a/git-http-fetch.html b/git-http-fetch.html index 664d9e1..2f76732 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-http-fetch(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-http-fetch(1)</title> </head> <body> <div id="header"> @@ -318,18 +412,18 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git http-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url></p></div> +<div class="paragraph"><p><em>git http-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Downloads a remote git repository via HTTP.</p></div> +<div class="paragraph"><p>Downloads a remote git repository via HTTP.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> commit-id </dt> <dd> @@ -338,7 +432,7 @@ pull. </p> </dd> -<dt> +<dt class="hdlist1"> -c </dt> <dd> @@ -346,7 +440,7 @@ Get the commit objects. </p> </dd> -<dt> +<dt class="hdlist1"> -t </dt> <dd> @@ -354,7 +448,7 @@ Get trees associated with the commit objects. </p> </dd> -<dt> +<dt class="hdlist1"> -a </dt> <dd> @@ -362,7 +456,7 @@ Get all the objects. </p> </dd> -<dt> +<dt class="hdlist1"> -v </dt> <dd> @@ -370,7 +464,7 @@ Report what is downloaded. </p> </dd> -<dt> +<dt class="hdlist1"> -w <filename> </dt> <dd> @@ -379,7 +473,7 @@ the local end after the transfer is complete. </p> </dd> -<dt> +<dt class="hdlist1"> --stdin </dt> <dd> @@ -392,7 +486,7 @@ <pre><tt><commit-id>['\t'<filename-as-in--w>]</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> --recover </dt> <dd> @@ -405,19 +499,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:46 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-http-push.html b/git-http-push.html index e937c4b..b7377f4 100644 --- a/git-http-push.html +++ b/git-http-push.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-http-push(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-http-push(1)</title> </head> <body> <div id="header"> @@ -318,32 +412,32 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git http-push</em> [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>…]</p></div> +<div class="paragraph"><p><em>git http-push</em> [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>…]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Sends missing objects to remote repository, and updates the +<div class="paragraph"><p>Sends missing objects to remote repository, and updates the remote branch.</p></div> -<div class="para"><p><strong>NOTE</strong>: This command is temporarily disabled if your libcurl +<div class="paragraph"><p><strong>NOTE</strong>: This command is temporarily disabled if your libcurl is older than 7.16, as the combination has been reported not to work and sometimes corrupts repository.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --all </dt> <dd> <p> Do not assume that the remote repository is complete in its current state, and verify all objects in the entire local - ref's history exist in the remote repository. + ref’s history exist in the remote repository. </p> </dd> -<dt> +<dt class="hdlist1"> --force </dt> <dd> @@ -355,7 +449,7 @@ care. </p> </dd> -<dt> +<dt class="hdlist1"> --dry-run </dt> <dd> @@ -363,7 +457,7 @@ Do everything except actually send the updates. </p> </dd> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -372,10 +466,10 @@ list of objects successfully sent to the remote repository. </p> </dd> -<dt> +<dt class="hdlist1"> -d </dt> -<dt> +<dt class="hdlist1"> -D </dt> <dd> @@ -384,7 +478,7 @@ cannot be the remote HEAD. If -d is specified the following other conditions must also be met: </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Remote HEAD must resolve to an object that exists locally @@ -402,7 +496,7 @@ </li> </ul></div> </dd> -<dt> +<dt class="hdlist1"> <ref>… </dt> <dd> @@ -414,16 +508,16 @@ </div> <h2 id="_specifying_the_refs">Specifying the Refs</h2> <div class="sectionbody"> -<div class="para"><p>A <em><ref></em> specification can be either a single pattern, or a pair +<div class="paragraph"><p>A <em><ref></em> specification can be either a single pattern, or a pair of such patterns separated by a colon ":" (this means that a ref name cannot have a colon in it). A single pattern <em><name></em> is just a shorthand for <em><name>:<name></em>.</p></div> -<div class="para"><p>Each pattern pair consists of the source side (before the colon) +<div class="paragraph"><p>Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> It is an error if <src> does not match exactly one of the @@ -434,7 +528,7 @@ <p> If <dst> does not match any remote ref, either </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> it has to start with "refs/"; <dst> is used as the @@ -451,30 +545,30 @@ </ul></div> </li> </ul></div> -<div class="para"><p>Without <em>--force</em>, the <src> ref is stored at the remote only if +<div class="paragraph"><p>Without <em>--force</em>, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This check, known as "fast-forward check", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples' commits from there.</p></div> -<div class="para"><p>With <em>--force</em>, the fast-forward check is disabled for all refs.</p></div> -<div class="para"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign +<div class="paragraph"><p>With <em>--force</em>, the fast-forward check is disabled for all refs.</p></div> +<div class="paragraph"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign to disable the fast-forward check only on that ref.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Nick Hengeveld <nickh@reactrix.com></p></div> +<div class="paragraph"><p>Written by Nick Hengeveld <<a href="mailto:nickh@reactrix.com">nickh@reactrix.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Nick Hengeveld</p></div> +<div class="paragraph"><p>Documentation by Nick Hengeveld</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:46 UTC +Last updated 2009-11-16 02:10:07 UTC </div> </div> </body> diff --git a/git-imap-send.html b/git-imap-send.html index d83064e..612ca31 100644 --- a/git-imap-send.html +++ b/git-imap-send.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-imap-send(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-imap-send(1)</title> </head> <body> <div id="header"> @@ -318,28 +412,28 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git imap-send</em></p></div> +<div class="paragraph"><p><em>git imap-send</em></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This command uploads a mailbox generated with <em>git format-patch</em> +<div class="paragraph"><p>This command uploads a mailbox generated with <em>git format-patch</em> into an IMAP drafts folder. This allows patches to be sent as other email is when using mail clients that cannot read mailbox files directly. The command also works with any general mailbox in which emails have the fields "From", "Date", and "Subject" in that order.</p></div> -<div class="para"><p>Typical usage is something like:</p></div> -<div class="para"><p>git format-patch --signoff --stdout --attach origin | git imap-send</p></div> +<div class="paragraph"><p>Typical usage is something like:</p></div> +<div class="paragraph"><p>git format-patch --signoff --stdout --attach origin | git imap-send</p></div> </div> <h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<div class="para"><p>To use the tool, imap.folder and either imap.tunnel or imap.host must be set +<div class="paragraph"><p>To use the tool, imap.folder and either imap.tunnel or imap.host must be set to appropriate values.</p></div> <h3 id="_variables">Variables</h3><div style="clear:left"></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> imap.folder </dt> <dd> @@ -349,7 +443,7 @@ "[Gmail]/Drafts". Required to use imap-send. </p> </dd> -<dt> +<dt class="hdlist1"> imap.tunnel </dt> <dd> @@ -359,7 +453,7 @@ to the server. Required when imap.host is not set to use imap-send. </p> </dd> -<dt> +<dt class="hdlist1"> imap.host </dt> <dd> @@ -370,7 +464,7 @@ otherwise. </p> </dd> -<dt> +<dt class="hdlist1"> imap.user </dt> <dd> @@ -378,7 +472,7 @@ The username to use when logging in to the server. </p> </dd> -<dt> +<dt class="hdlist1"> imap.pass </dt> <dd> @@ -386,7 +480,7 @@ The password to use when logging in to the server. </p> </dd> -<dt> +<dt class="hdlist1"> imap.port </dt> <dd> @@ -396,7 +490,7 @@ Ignored when imap.tunnel is set. </p> </dd> -<dt> +<dt class="hdlist1"> imap.sslverify </dt> <dd> @@ -406,7 +500,7 @@ imap.tunnel is set. </p> </dd> -<dt> +<dt class="hdlist1"> imap.preformattedHTML </dt> <dd> @@ -418,7 +512,7 @@ format=fixed email. Default is <tt>false</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> imap.authMethod </dt> <dd> @@ -429,14 +523,14 @@ </dd> </dl></div> <h3 id="_examples">Examples</h3><div style="clear:left"></div> -<div class="para"><p>Using tunnel mode:</p></div> +<div class="paragraph"><p>Using tunnel mode:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[imap] folder = "INBOX.Drafts" tunnel = "ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2> /dev/null"</tt></pre> </div></div> -<div class="para"><p>Using direct mode:</p></div> +<div class="paragraph"><p>Using direct mode:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[imap] @@ -445,7 +539,7 @@ user = bob pass = p4ssw0rd</tt></pre> </div></div> -<div class="para"><p>Using direct mode with SSL:</p></div> +<div class="paragraph"><p>Using direct mode with SSL:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>[imap] @@ -459,31 +553,31 @@ </div> <h2 id="_caution">CAUTION</h2> <div class="sectionbody"> -<div class="para"><p>It is still your responsibility to make sure that the email message +<div class="paragraph"><p>It is still your responsibility to make sure that the email message sent by your email program meets the standards of your project. Many projects do not like patches to be attached. Some mail agents will transform patches (e.g. wrap lines, send them as format=flowed) in ways that make them fail. You will get angry -flames ridiculing you if you don't check this.</p></div> -<div class="para"><p>Thunderbird in particular is known to be problematic. Thunderbird +flames ridiculing you if you don’t check this.</p></div> +<div class="paragraph"><p>Thunderbird in particular is known to be problematic. Thunderbird users may wish to visit this web page for more information: - http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email</p></div> + <a href="http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email">http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Derived from isync 1.0.1 by Mike McCormack.</p></div> +<div class="paragraph"><p>Derived from isync 1.0.1 by Mike McCormack.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Mike McCormack</p></div> +<div class="paragraph"><p>Documentation by Mike McCormack</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:46 UTC +Last updated 2010-04-04 19:11:43 UTC </div> </div> </body> diff --git a/git-init-db.html b/git-init-db.html index 663a85e..d0136ef 100644 --- a/git-init-db.html +++ b/git-init-db.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-init-db(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-init-db(1)</title> </head> <body> <div id="header"> @@ -318,18 +412,18 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git init-db</em> [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]</p></div> +<div class="paragraph"><p><em>git init-db</em> [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This is a synonym for <a href="git-init.html">git-init(1)</a>. Please refer to the +<div class="paragraph"><p>This is a synonym for <a href="git-init.html">git-init(1)</a>. Please refer to the documentation of that command.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:46 UTC +Last updated 2009-08-05 21:21:11 UTC </div> </div> </body> diff --git a/git-instaweb.html b/git-instaweb.html index b1b960a..f56ee8d 100644 --- a/git-instaweb.html +++ b/git-instaweb.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-instaweb(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-instaweb(1)</title> </head> <body> <div id="header"> @@ -318,25 +412,27 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git instaweb</em> [--local] [--httpd=<httpd>] [--port=<port>] +<div class="verseblock-content"><em>git instaweb</em> [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>] -<em>git instaweb</em> [--start] [--stop] [--restart]</div></div> +<em>git instaweb</em> [--start] [--stop] [--restart]</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>A simple script to set up <tt>gitweb</tt> and a web server for browsing the local +<div class="paragraph"><p>A simple script to set up <tt>gitweb</tt> and a web server for browsing the local repository.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -l </dt> -<dt> +<dt class="hdlist1"> --local </dt> <dd> @@ -344,10 +440,10 @@ Only bind the web server to the local IP (127.0.0.1). </p> </dd> -<dt> +<dt class="hdlist1"> -d </dt> -<dt> +<dt class="hdlist1"> --httpd </dt> <dd> @@ -359,10 +455,10 @@ (Default: lighttpd) </p> </dd> -<dt> +<dt class="hdlist1"> -m </dt> -<dt> +<dt class="hdlist1"> --module-path </dt> <dd> @@ -371,10 +467,10 @@ (Default: /usr/lib/apache2/modules) </p> </dd> -<dt> +<dt class="hdlist1"> -p </dt> -<dt> +<dt class="hdlist1"> --port </dt> <dd> @@ -382,10 +478,10 @@ The port number to bind the httpd to. (Default: 1234) </p> </dd> -<dt> +<dt class="hdlist1"> -b </dt> -<dt> +<dt class="hdlist1"> --browser </dt> <dd> @@ -397,10 +493,10 @@ the script fails, the URL will be printed to stdout. </p> </dd> -<dt> +<dt class="hdlist1"> start </dt> -<dt> +<dt class="hdlist1"> --start </dt> <dd> @@ -409,10 +505,10 @@ any of the configuration files for spawning a new instance. </p> </dd> -<dt> +<dt class="hdlist1"> stop </dt> -<dt> +<dt class="hdlist1"> --stop </dt> <dd> @@ -422,10 +518,10 @@ nor does it close the browser. </p> </dd> -<dt> +<dt class="hdlist1"> restart </dt> -<dt> +<dt class="hdlist1"> --restart </dt> <dd> @@ -438,7 +534,7 @@ </div> <h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<div class="para"><p>You may specify configuration in your .git/config</p></div> +<div class="paragraph"><p>You may specify configuration in your .git/config</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[instaweb] @@ -446,28 +542,27 @@ httpd = apache2 -f port = 4321 browser = konqueror - modulepath = /usr/lib/apache2/modules -</tt></pre> + modulepath = /usr/lib/apache2/modules</tt></pre> </div></div> -<div class="para"><p>If the configuration variable <em>instaweb.browser</em> is not set, +<div class="paragraph"><p>If the configuration variable <em>instaweb.browser</em> is not set, <em>web.browser</em> will be used instead if it is defined. See <a href="git-web--browse.html">git-web--browse(1)</a> for more information about this.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Eric Wong <normalperson@yhbt.net></p></div> +<div class="paragraph"><p>Written by Eric Wong <<a href="mailto:normalperson@yhbt.net">normalperson@yhbt.net</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Eric Wong <normalperson@yhbt.net>.</p></div> +<div class="paragraph"><p>Documentation by Eric Wong <<a href="mailto:normalperson@yhbt.net">normalperson@yhbt.net</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:46 UTC +Last updated 2010-09-03 21:29:54 UTC </div> </div> </body> diff --git a/git-lost-found.html b/git-lost-found.html index cb17ec6..94e01ad 100644 --- a/git-lost-found.html +++ b/git-lost-found.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-lost-found(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-lost-found(1)</title> </head> <body> <div id="header"> @@ -318,27 +412,27 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git lost-found</em></p></div> +<div class="paragraph"><p><em>git lost-found</em></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p><strong>NOTE</strong>: this command is deprecated. Use <a href="git-fsck.html">git-fsck(1)</a> with +<div class="paragraph"><p><strong>NOTE</strong>: this command is deprecated. Use <a href="git-fsck.html">git-fsck(1)</a> with the option <em>--lost-found</em> instead.</p></div> -<div class="para"><p>Finds dangling commits and tags from the object database, and +<div class="paragraph"><p>Finds dangling commits and tags from the object database, and creates refs to them in the .git/lost-found/ directory. Commits and tags that dereference to commits are stored in .git/lost-found/commit, and other objects are stored in .git/lost-found/other.</p></div> </div> <h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<div class="para"><p>Prints to standard output the object names and one-line descriptions +<div class="paragraph"><p>Prints to standard output the object names and one-line descriptions of any commits or tags found.</p></div> </div> <h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<div class="para"><p>Suppose you run <em>git tag -f</em> and mistype the tag to overwrite. +<div class="paragraph"><p>Suppose you run <em>git tag -f</em> and mistype the tag to overwrite. The ref to your tag is overwritten, but until you run <em>git prune</em>, the tag itself is still there.</p></div> <div class="listingblock"> @@ -347,13 +441,13 @@ [1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c ...</tt></pre> </div></div> -<div class="para"><p>Also you can use gitk to browse how any tags found relate to each +<div class="paragraph"><p>Also you can use gitk to browse how any tags found relate to each other.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ gitk $(cd .git/lost-found/commit && echo ??*)</tt></pre> </div></div> -<div class="para"><p>After making sure you know which the object is the tag you are looking +<div class="paragraph"><p>After making sure you know which the object is the tag you are looking for, you can reconnect it to your regular .git/refs hierarchy.</p></div> <div class="listingblock"> <div class="content"> @@ -376,19 +470,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:47 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-ls-remote.html b/git-ls-remote.html index 1293c11..339bcd3 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-ls-remote(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-ls-remote(1)</title> </head> <body> <div id="header"> @@ -318,44 +412,46 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git ls-remote</em> [--heads] [--tags] [-u <exec> | --upload-pack <exec>] - <repository> <refs>…</div></div> +<div class="verseblock-content"><em>git ls-remote</em> [--heads] [--tags] [-u <exec> | --upload-pack <exec>] + <repository> <refs>…</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Displays references available in a remote repository along with the associated +<div class="paragraph"><p>Displays references available in a remote repository along with the associated commit IDs.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -h </dt> -<dt> +<dt class="hdlist1"> --heads </dt> -<dt> +<dt class="hdlist1"> -t </dt> -<dt> +<dt class="hdlist1"> --tags </dt> <dd> <p> Limit to only refs/heads and refs/tags, respectively. - These options are _not_ mutually exclusive; when given + These options are <em>not</em> mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. </p> </dd> -<dt> +<dt class="hdlist1"> -u <exec> </dt> -<dt> +<dt class="hdlist1"> --upload-pack=<exec> </dt> <dd> @@ -366,7 +462,7 @@ user. </p> </dd> -<dt> +<dt class="hdlist1"> <repository> </dt> <dd> @@ -376,7 +472,7 @@ the local repository. </p> </dd> -<dt> +<dt class="hdlist1"> <refs>… </dt> <dd> @@ -413,15 +509,15 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:47 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-mailinfo.html b/git-mailinfo.html index 577f611..c0ddd4a 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-mailinfo(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-mailinfo(1)</title> </head> <body> <div id="header"> @@ -318,13 +412,13 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git mailinfo</em> [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch></p></div> +<div class="paragraph"><p><em>git mailinfo</em> [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Reads a single e-mail message from the standard input, and +<div class="paragraph"><p>Reads a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are written out to the standard output to be used by <em>git am</em> @@ -333,8 +427,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -k </dt> <dd> @@ -348,7 +442,7 @@ <em>git format-patch -k</em> output. </p> </dd> -<dt> +<dt class="hdlist1"> -b </dt> <dd> @@ -358,7 +452,7 @@ only the pairs whose bracketed string contains the word "PATCH". </p> </dd> -<dt> +<dt class="hdlist1"> -u </dt> <dd> @@ -369,10 +463,10 @@ i18n.commitencoding (defaulting to UTF-8) by transliterating them. This used to be optional but now it is the default. </p> -<div class="para"><p>Note that the patch is always used as-is without charset +<div class="paragraph"><p>Note that the patch is always used as-is without charset conversion, even with this flag.</p></div> </dd> -<dt> +<dt class="hdlist1"> --encoding=<encoding> </dt> <dd> @@ -381,7 +475,7 @@ used instead of the one specified by i18n.commitencoding or UTF-8. </p> </dd> -<dt> +<dt class="hdlist1"> -n </dt> <dd> @@ -389,7 +483,7 @@ Disable all charset re-coding of the metadata. </p> </dd> -<dt> +<dt class="hdlist1"> --scissors </dt> <dd> @@ -402,13 +496,13 @@ before it (including the scissors line itself) is ignored when this option is used. </p> -<div class="para"><p>This is useful if you want to begin your message in a discussion thread +<div class="paragraph"><p>This is useful if you want to begin your message in a discussion thread with comments and suggestions on the message you are responding to, and to conclude it with a patch submission, separating the discussion and the beginning of the proposed commit log message with a scissors line.</p></div> -<div class="para"><p>This can enabled by default with the configuration option mailinfo.scissors.</p></div> +<div class="paragraph"><p>This can enabled by default with the configuration option mailinfo.scissors.</p></div> </dd> -<dt> +<dt class="hdlist1"> --no-scissors </dt> <dd> @@ -416,7 +510,7 @@ Ignore scissors lines. Useful for overriding mailinfo.scissors settings. </p> </dd> -<dt> +<dt class="hdlist1"> <msg> </dt> <dd> @@ -425,7 +519,7 @@ except the title line which comes from e-mail Subject. </p> </dd> -<dt> +<dt class="hdlist1"> <patch> </dt> <dd> @@ -437,20 +531,20 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>> and +Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:48 UTC +Last updated 2010-06-14 05:18:08 UTC </div> </div> </body> diff --git a/git-merge-base.html b/git-merge-base.html index 6968da1..58dccfe 100644 --- a/git-merge-base.html +++ b/git-merge-base.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-merge-base(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-merge-base(1)</title> </head> <body> <div id="header"> @@ -318,37 +412,39 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git merge-base</em> [-a|--all] [--octopus] <commit> <commit>… -<em>git merge-base</em> --independent <commit>…</div></div> +<div class="verseblock-content"><em>git merge-base</em> [-a|--all] [--octopus] <commit> <commit>… +<em>git merge-base</em> --independent <commit>…</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p><em>git merge-base</em> finds best common ancestor(s) between two commits to use +<div class="paragraph"><p><em>git merge-base</em> finds best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is <em>better</em> than another common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a <em>best common ancestor</em>, i.e. a <em>merge base</em>. Note that there can be more than one merge base for a pair of commits.</p></div> -<div class="para"><p>Unless <tt>--octopus</tt> is given, among the two commits to compute the merge +<div class="paragraph"><p>Unless <tt>--octopus</tt> is given, among the two commits to compute the merge base from, one is specified by the first commit argument on the command line; the other commit is a (possibly hypothetical) commit that is a merge across all the remaining commits on the command line. As the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits.</p></div> -<div class="para"><p>As a consequence, the <em>merge base</em> is not necessarily contained in each of the +<div class="paragraph"><p>As a consequence, the <em>merge base</em> is not necessarily contained in each of the commit arguments if more than two commits are specified. This is different from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <tt>--merge-base</tt> option.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -a </dt> -<dt> +<dt class="hdlist1"> --all </dt> <dd> @@ -356,7 +452,7 @@ Output all merge bases for the commits, instead of just one. </p> </dd> -<dt> +<dt class="hdlist1"> --octopus </dt> <dd> @@ -366,7 +462,7 @@ of <em>git show-branch --merge-base</em>. </p> </dd> -<dt> +<dt class="hdlist1"> --independent </dt> <dd> @@ -382,17 +478,17 @@ </div> <h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<div class="para"><p>Given two commits <em>A</em> and <em>B</em>, <tt>git merge-base A B</tt> will output a commit +<div class="paragraph"><p>Given two commits <em>A</em> and <em>B</em>, <tt>git merge-base A B</tt> will output a commit which is reachable from both <em>A</em> and <em>B</em> through the parent relationship.</p></div> -<div class="para"><p>For example, with this topology:</p></div> +<div class="paragraph"><p>For example, with this topology:</p></div> <div class="literalblock"> <div class="content"> <pre><tt> o---o---o---B / ---o---1---o---o---o---A</tt></pre> </div></div> -<div class="para"><p>the merge base between <em>A</em> and <em>B</em> is <em>1</em>.</p></div> -<div class="para"><p>Given three commits <em>A</em>, <em>B</em> and <em>C</em>, <tt>git merge-base A B C</tt> will compute the +<div class="paragraph"><p>the merge base between <em>A</em> and <em>B</em> is <em>1</em>.</p></div> +<div class="paragraph"><p>Given three commits <em>A</em>, <em>B</em> and <em>C</em>, <tt>git merge-base A B C</tt> will compute the merge base between <em>A</em> and a hypothetical commit <em>M</em>, which is a merge between <em>B</em> and <em>C</em>. For example, with this topology:</p></div> <div class="literalblock"> @@ -403,7 +499,7 @@ / / ---2---1---o---o---o---A</tt></pre> </div></div> -<div class="para"><p>the result of <tt>git merge-base A B C</tt> is <em>1</em>. This is because the +<div class="paragraph"><p>the result of <tt>git merge-base A B C</tt> is <em>1</em>. This is because the equivalent topology with a merge commit <em>M</em> between <em>B</em> and <em>C</em> is:</p></div> <div class="literalblock"> <div class="content"> @@ -413,10 +509,10 @@ / / ---2---1---o---o---o---A</tt></pre> </div></div> -<div class="para"><p>and the result of <tt>git merge-base A M</tt> is <em>1</em>. Commit <em>2</em> is also a +<div class="paragraph"><p>and the result of <tt>git merge-base A M</tt> is <em>1</em>. Commit <em>2</em> is also a common ancestor between <em>A</em> and <em>M</em>, but <em>1</em> is a better common ancestor, because <em>2</em> is an ancestor of <em>1</em>. Hence, <em>2</em> is not a merge base.</p></div> -<div class="para"><p>When the history involves criss-cross merges, there can be more than one +<div class="paragraph"><p>When the history involves criss-cross merges, there can be more than one <em>best</em> common ancestor for two commits. For example, with this topology:</p></div> <div class="literalblock"> <div class="content"> @@ -426,31 +522,31 @@ / \ ---2---o---o---B</tt></pre> </div></div> -<div class="para"><p>both <em>1</em> and <em>2</em> are merge-bases of A and B. Neither one is better than +<div class="paragraph"><p>both <em>1</em> and <em>2</em> are merge-bases of A and B. Neither one is better than the other (both are <em>best</em> merge bases). When the <tt>--all</tt> option is not given, it is unspecified which best one is output.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_see_also">See also</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-rev-list.html">git-rev-list(1)</a>, +<div class="paragraph"><p><a href="git-rev-list.html">git-rev-list(1)</a>, <a href="git-show-branch.html">git-show-branch(1)</a>, <a href="git-merge.html">git-merge(1)</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:48 UTC +Last updated 2010-09-03 21:29:54 UTC </div> </div> </body> diff --git a/git-merge-file.html b/git-merge-file.html index 31a99be..3c0d5ba 100644 --- a/git-merge-file.html +++ b/git-merge-file.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-merge-file(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-merge-file(1)</title> </head> <body> <div id="header"> @@ -318,22 +412,24 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git merge-file</em> [-L <current-name> [-L <base-name> [-L <other-name>]]] +<div class="verseblock-content"><em>git merge-file</em> [-L <current-name> [-L <base-name> [-L <other-name>]]] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] - <current-file> <base-file> <other-file></div></div> + <current-file> <base-file> <other-file></div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p><em>git merge-file</em> incorporates all changes that lead from the <tt><base-file></tt> +<div class="paragraph"><p><em>git merge-file</em> incorporates all changes that lead from the <tt><base-file></tt> to <tt><other-file></tt> into <tt><current-file></tt>. The result ordinarily goes into <tt><current-file></tt>. <em>git merge-file</em> is useful for combining separate changes to an original. Suppose <tt><base-file></tt> is the original, and both <tt><current-file></tt> and <tt><other-file></tt> are modifications of <tt><base-file></tt>, then <em>git merge-file</em> combines both changes.</p></div> -<div class="para"><p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes +<div class="paragraph"><p>A conflict occurs if both <tt><current-file></tt> and <tt><other-file></tt> have changes in a common segment of lines. If a conflict is found, <em>git merge-file</em> normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this:</p></div> @@ -345,21 +441,21 @@ lines in file B >>>>>>> B</tt></pre> </div></div> -<div class="para"><p>If there are conflicts, the user should edit the result and delete one of +<div class="paragraph"><p>If there are conflicts, the user should edit the result and delete one of the alternatives. When <tt>--ours</tt>, <tt>--theirs</tt>, or <tt>--union</tt> option is in effect, however, these conflicts are resolved favouring lines from <tt><current-file></tt>, lines from <tt><other-file></tt>, or lines from both respectively. The length of the conflict markers can be given with the <tt>--marker-size</tt> option.</p></div> -<div class="para"><p>The exit value of this program is negative on error, and the number of +<div class="paragraph"><p>The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0.</p></div> -<div class="para"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it +<div class="paragraph"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it implements all of RCS <em>merge</em>'s functionality which is needed by <a href="git.html">git(1)</a>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -L <label> </dt> <dd> @@ -372,7 +468,7 @@ from files a, b and c. </p> </dd> -<dt> +<dt class="hdlist1"> -p </dt> <dd> @@ -381,7 +477,7 @@ <tt><current-file></tt>. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> <dd> @@ -389,13 +485,13 @@ Quiet; do not warn about conflicts. </p> </dd> -<dt> +<dt class="hdlist1"> --ours </dt> -<dt> +<dt class="hdlist1"> --theirs </dt> -<dt> +<dt class="hdlist1"> --union </dt> <dd> @@ -408,8 +504,8 @@ </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> git merge-file README.my README README.upstream </dt> <dd> @@ -418,7 +514,7 @@ tries to merge them and writes the result into README.my. </p> </dd> -<dt> +<dt class="hdlist1"> git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345 </dt> <dd> @@ -431,20 +527,20 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Johannes Schindelin <johannes.schindelin@gmx.de></p></div> +<div class="paragraph"><p>Written by Johannes Schindelin <<a href="mailto:johannes.schindelin@gmx.de">johannes.schindelin@gmx.de</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>, +<div class="paragraph"><p>Documentation by Johannes Schindelin and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>, with parts copied from the original documentation of RCS <em>merge</em>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:49 UTC +Last updated 2010-03-20 20:59:08 UTC </div> </div> </body> diff --git a/git-merge-index.html b/git-merge-index.html index 7d65a01..1bf1f7a 100644 --- a/git-merge-index.html +++ b/git-merge-index.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-merge-index(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-merge-index(1)</title> </head> <body> <div id="header"> @@ -318,21 +412,21 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p></div> +<div class="paragraph"><p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This looks up the <file>(s) in the index and, if there are any merge +<div class="paragraph"><p>This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -- </dt> <dd> @@ -340,7 +434,7 @@ Do not interpret any more arguments as options. </p> </dd> -<dt> +<dt class="hdlist1"> -a </dt> <dd> @@ -348,7 +442,7 @@ Run merge against all files in the index that need merging. </p> </dd> -<dt> +<dt class="hdlist1"> -o </dt> <dd> @@ -359,7 +453,7 @@ merges. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> <dd> @@ -370,18 +464,18 @@ </p> </dd> </dl></div> -<div class="para"><p>If <em>git merge-index</em> is called with multiple <file>s (or -a) then it +<div class="paragraph"><p>If <em>git merge-index</em> is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code.</p></div> -<div class="para"><p>Typically this is run with a script calling git's imitation of +<div class="paragraph"><p>Typically this is run with a script calling git’s imitation of the <em>merge</em> command from the RCS package.</p></div> -<div class="para"><p>A sample script called <em>git merge-one-file</em> is included in the +<div class="paragraph"><p>A sample script called <em>git merge-one-file</em> is included in the distribution.</p></div> -<div class="para"><p>ALERT ALERT ALERT! The git "merge object order" is different from the +<div class="paragraph"><p>ALERT ALERT ALERT! The git "merge object order" is different from the RCS <em>merge</em> program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program -<em>merge</em> is to have the original in the middle. Don't ask me why.</p></div> -<div class="para"><p>Examples:</p></div> +<em>merge</em> is to have the original in the middle. Don’t ask me why.</p></div> +<div class="paragraph"><p>Examples:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat MM @@ -390,7 +484,7 @@ This is modified MM in the branch B. # merge2 This is modified MM in the branch B. # current contents</tt></pre> </div></div> -<div class="para"><p>or</p></div> +<div class="paragraph"><p>or</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat AA MM @@ -400,27 +494,27 @@ This is added AA in the branch B. fatal: merge program failed</tt></pre> </div></div> -<div class="para"><p>where the latter example shows how <em>git merge-index</em> will stop trying to +<div class="paragraph"><p>where the latter example shows how <em>git merge-index</em> will stop trying to merge once anything has returned an error (i.e., <tt>cat</tt> returned an error -for the AA file, because it didn't exist in the original, and thus -<em>git merge-index</em> didn't even try to merge the MM thing).</p></div> +for the AA file, because it didn’t exist in the original, and thus +<em>git merge-index</em> didn’t even try to merge the MM thing).</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> -One-shot merge by Petr Baudis <pasky@ucw.cz></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>> +One-shot merge by Petr Baudis <<a href="mailto:pasky@ucw.cz">pasky@ucw.cz</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:49 UTC +Last updated 2010-09-03 21:29:54 UTC </div> </div> </body> diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 038868f..620fe92 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-merge-one-file(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-merge-one-file(1)</title> </head> <body> <div id="header"> @@ -318,31 +412,31 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git merge-one-file</em></p></div> +<div class="paragraph"><p><em>git merge-one-file</em></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This is the standard helper program to use with <em>git merge-index</em> +<div class="paragraph"><p>This is the standard helper program to use with <em>git merge-index</em> to resolve a merge after the trivial merge done with <em>git read-tree -m</em>.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.</p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>>, +Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> and Petr Baudis <<a href="mailto:pasky@suse.cz">pasky@suse.cz</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:49 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-merge-tree.html b/git-merge-tree.html index 3d745f3..c608404 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-merge-tree(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-merge-tree(1)</title> </head> <body> <div id="header"> @@ -318,37 +412,37 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git merge-tree</em> <base-tree> <branch1> <branch2></p></div> +<div class="paragraph"><p><em>git merge-tree</em> <base-tree> <branch1> <branch2></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Reads three treeish, and output trivial merge results and +<div class="paragraph"><p>Reads three treeish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way <em>git read-tree -m</em> does, but instead of storing the results in the index, the command outputs the entries to the standard output.</p></div> -<div class="para"><p>This is meant to be used by higher level scripts to compute +<div class="paragraph"><p>This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits entries that match the <branch1> tree.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:49 UTC +Last updated 2008-12-10 08:33:05 UTC </div> </div> </body> diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index 5ce5cf5..4bcc9b5 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-mergetool--lib(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-mergetool--lib(1)</title> </head> <body> <div id="header"> @@ -318,26 +412,26 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"</em></p></div> +<div class="paragraph"><p><em>TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool—lib"</em></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This is not a command the end user would want to run. Ever. +<div class="paragraph"><p>This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones.</p></div> -<div class="para"><p>The <em>git-mergetool--lib</em> scriptlet is designed to be sourced (using +<div class="paragraph"><p>The <em>git-mergetool--lib</em> scriptlet is designed to be sourced (using <tt>.</tt>) by other shell scripts to set up functions for working with git merge tools.</p></div> -<div class="para"><p>Before sourcing <em>git-mergetool--lib</em>, your script must set <tt>TOOL_MODE</tt> +<div class="paragraph"><p>Before sourcing <em>git-mergetool--lib</em>, your script must set <tt>TOOL_MODE</tt> to define the operation mode for the functions listed below. <em>diff</em> and <em>merge</em> are valid values.</p></div> </div> <h2 id="_functions">FUNCTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> get_merge_tool </dt> <dd> @@ -345,7 +439,7 @@ returns a merge tool. </p> </dd> -<dt> +<dt class="hdlist1"> get_merge_tool_cmd </dt> <dd> @@ -353,7 +447,7 @@ returns the custom command for a merge tool. </p> </dd> -<dt> +<dt class="hdlist1"> get_merge_tool_path </dt> <dd> @@ -361,7 +455,7 @@ returns the custom path for a merge tool. </p> </dd> -<dt> +<dt class="hdlist1"> run_merge_tool </dt> <dd> @@ -376,19 +470,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by David Aguilar <davvid@gmail.com></p></div> +<div class="paragraph"><p>Written by David Aguilar <<a href="mailto:davvid@gmail.com">davvid@gmail.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Aguilar and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Aguilar and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:49 UTC +Last updated 2010-09-03 21:29:54 UTC </div> </div> </body> diff --git a/git-mktag.html b/git-mktag.html index bdda37f..11d688c 100644 --- a/git-mktag.html +++ b/git-mktag.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-mktag(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-mktag(1)</title> </head> <body> <div id="header"> @@ -318,19 +412,19 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git mktag</em> < signature_file</p></div> +<div class="paragraph"><p><em>git mktag</em> < signature_file</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Reads a tag contents on standard input and creates a tag object +<div class="paragraph"><p>Reads a tag contents on standard input and creates a tag object that can also be used to sign other objects.</p></div> -<div class="para"><p>The output is the new tag's <object> identifier.</p></div> +<div class="paragraph"><p>The output is the new tag’s <object> identifier.</p></div> </div> <h2 id="_tag_format">Tag Format</h2> <div class="sectionbody"> -<div class="para"><p>A tag signature file has a very simple fixed format: four lines of</p></div> +<div class="paragraph"><p>A tag signature file has a very simple fixed format: four lines of</p></div> <div class="literalblock"> <div class="content"> <pre><tt>object <sha1> @@ -338,27 +432,27 @@ tag <tagname> tagger <tagger></tt></pre> </div></div> -<div class="para"><p>followed by some <em>optional</em> free-form message (some tags created +<div class="paragraph"><p>followed by some <em>optional</em> free-form message (some tags created by older git may not have <tt>tagger</tt> line). The message, when exists, is separated by a blank line from the header. The -message part may contain a signature that git itself doesn't +message part may contain a signature that git itself doesn’t care about, but that can be verified with gpg.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:50 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-mktree.html b/git-mktree.html index 7e80609..ba3785d 100644 --- a/git-mktree.html +++ b/git-mktree.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-mktree(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-mktree(1)</title> </head> <body> <div id="header"> @@ -318,21 +412,21 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git mktree</em> [-z] [--missing] [--batch]</p></div> +<div class="paragraph"><p><em>git mktree</em> [-z] [--missing] [--batch]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Reads standard input in non-recursive <tt>ls-tree</tt> output format, and creates +<div class="paragraph"><p>Reads standard input in non-recursive <tt>ls-tree</tt> output format, and creates a tree object. The order of the tree entries is normalised by mktree so pre-sorting the input is not required. The object name of the tree object built is written to the standard output.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -z </dt> <dd> @@ -340,18 +434,18 @@ Read the NUL-terminated <tt>ls-tree -z</tt> output instead. </p> </dd> -<dt> +<dt class="hdlist1"> --missing </dt> <dd> <p> Allow missing objects. The default behaviour (without this option) - is to verify that each tree entry's sha1 identifies an existing + is to verify that each tree entry’s sha1 identifies an existing object. This option has no effect on the treatment of gitlink entries (aka "submodules") which are always allowed to be missing. </p> </dd> -<dt> +<dt class="hdlist1"> --batch </dt> <dd> @@ -366,19 +460,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:50 UTC +Last updated 2009-06-01 01:22:18 UTC </div> </div> </body> diff --git a/git-mv.html b/git-mv.html index 2919460..41fdd31 100644 --- a/git-mv.html +++ b/git-mv.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-mv(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-mv(1)</title> </head> <body> <div id="header"> @@ -318,32 +412,32 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git mv</em> <options>… <args>…</p></div> +<div class="paragraph"><p><em>git mv</em> <options>… <args>…</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This script is used to move or rename a file, directory or symlink.</p></div> +<div class="paragraph"><p>This script is used to move or rename a file, directory or symlink.</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git mv [-f] [-n] <source> <destination> git mv [-f] [-n] [-k] <source> ... <destination directory></tt></pre> </div></div> -<div class="para"><p>In the first form, it renames <source>, which must exist and be either +<div class="paragraph"><p>In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>. In the second form, the last argument has to be an existing directory; the given sources will be moved into this directory.</p></div> -<div class="para"><p>The index is updated after successful completion, but the change must still be +<div class="paragraph"><p>The index is updated after successful completion, but the change must still be committed.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -f </dt> -<dt> +<dt class="hdlist1"> --force </dt> <dd> @@ -351,7 +445,7 @@ Force renaming or moving of a file even if the target exists </p> </dd> -<dt> +<dt class="hdlist1"> -k </dt> <dd> @@ -362,10 +456,10 @@ file unless <em>-f</em> is given. </p> </dd> -<dt> +<dt class="hdlist1"> -n </dt> -<dt> +<dt class="hdlist1"> --dry-run </dt> <dd> @@ -377,21 +471,21 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> -Rewritten by Ryan Anderson <ryan@michonline.com> -Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>> +Rewritten by Ryan Anderson <<a href="mailto:ryan@michonline.com">ryan@michonline.com</a>> +Move functionality added by Josef Weidendorfer <<a href="mailto:Josef.Weidendorfer@gmx.de">Josef.Weidendorfer@gmx.de</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:50 UTC +Last updated 2009-08-30 00:22:32 UTC </div> </div> </body> diff --git a/git-name-rev.html b/git-name-rev.html index 672f44e..651b2d7 100644 --- a/git-name-rev.html +++ b/git-name-rev.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-name-rev(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-name-rev(1)</title> </head> <body> <div id="header"> @@ -318,21 +412,23 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git name-rev</em> [--tags] [--refs=<pattern>] - ( --all | --stdin | <committish>… )</div></div> +<div class="verseblock-content"><em>git name-rev</em> [--tags] [--refs=<pattern>] + ( --all | --stdin | <committish>… )</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Finds symbolic names suitable for human digestion for revisions given in any +<div class="paragraph"><p>Finds symbolic names suitable for human digestion for revisions given in any format parsable by <em>git rev-parse</em>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --tags </dt> <dd> @@ -340,7 +436,7 @@ Do not use branch names, but only tags to name the commits </p> </dd> -<dt> +<dt class="hdlist1"> --refs=<pattern> </dt> <dd> @@ -348,7 +444,7 @@ Only use refs whose names match a given shell pattern. </p> </dd> -<dt> +<dt class="hdlist1"> --all </dt> <dd> @@ -356,16 +452,16 @@ List all commits reachable from all refs </p> </dd> -<dt> +<dt class="hdlist1"> --stdin </dt> <dd> <p> - Read from stdin, append "(<rev_name>)" to all sha1's of nameable + Read from stdin, append "(<rev_name>)" to all sha1’s of nameable commits, and pass to stdout </p> </dd> -<dt> +<dt class="hdlist1"> --name-only </dt> <dd> @@ -376,7 +472,7 @@ of <tt>git-describe</tt> more closely. </p> </dd> -<dt> +<dt class="hdlist1"> --no-undefined </dt> <dd> @@ -385,7 +481,7 @@ instead of printing <tt>undefined</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> --always </dt> <dd> @@ -397,18 +493,18 @@ </div> <h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<div class="para"><p>Given a commit, find out where it is relative to the local refs. Say somebody +<div class="paragraph"><p>Given a commit, find out where it is relative to the local refs. Say somebody wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a. Of course, you look into the commit, but that only tells you what happened, but not the context.</p></div> -<div class="para"><p>Enter <em>git name-rev</em>:</p></div> +<div class="paragraph"><p>Enter <em>git name-rev</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a 33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99~940</tt></pre> </div></div> -<div class="para"><p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p></div> -<div class="para"><p>Another nice thing you can do is:</p></div> +<div class="paragraph"><p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p></div> +<div class="paragraph"><p>Another nice thing you can do is:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>% git log | git name-rev --stdin</tt></pre> @@ -416,19 +512,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Johannes Schindelin <Johannes.Schindelin@gmx.de></p></div> +<div class="paragraph"><p>Written by Johannes Schindelin <<a href="mailto:Johannes.Schindelin@gmx.de">Johannes.Schindelin@gmx.de</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Johannes Schindelin.</p></div> +<div class="paragraph"><p>Documentation by Johannes Schindelin.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:50 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-pack-redundant.html b/git-pack-redundant.html index e8a55f2..986ad9f 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-pack-redundant(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-pack-redundant(1)</title> </head> <body> <div id="header"> @@ -318,25 +412,26 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git pack-redundant</em> [ --verbose ] [ --alt-odb ] < --all | .pack filename … ></p></div> +<div class="paragraph"><p><em>git pack-redundant</em> [ --verbose ] [ --alt-odb ] < --all | .pack filename … ></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This program computes which packs in your repository +<div class="paragraph"><p>This program computes which packs in your repository are redundant. The output is suitable for piping to <tt>xargs rm</tt> if you are in the root of the repository.</p></div> -<div class="para"><p><em>git pack-redundant</em> accepts a list of objects on standard input. Any objects +<div class="paragraph"><p><em>git pack-redundant</em> accepts a list of objects on standard input. Any objects given will be ignored when checking which packs are required. This makes the following command useful when wanting to remove packs which contain unreachable objects.</p></div> -<div class="para"><p>git fsck --full --unreachable | cut -d <em> </em> -f3 | git pack-redundant --all | xargs rm</p></div> +<div class="paragraph"><p>git fsck --full --unreachable | cut -d ' ' -f3 | \ +git pack-redundant --all | xargs rm</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --all </dt> <dd> @@ -344,16 +439,16 @@ Processes all packs. Any filenames on the command line are ignored. </p> </dd> -<dt> +<dt class="hdlist1"> --alt-odb </dt> <dd> <p> - Don't require objects present in packs from alternate object + Don’t require objects present in packs from alternate object directories to be present in local packs. </p> </dd> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -365,25 +460,25 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Lukas Sandström <lukass@etek.chalmers.se></p></div> +<div class="paragraph"><p>Written by Lukas Sandström <<a href="mailto:lukass@etek.chalmers.se">lukass@etek.chalmers.se</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Lukas Sandström <lukass@etek.chalmers.se></p></div> +<div class="paragraph"><p>Documentation by Lukas Sandström <<a href="mailto:lukass@etek.chalmers.se">lukass@etek.chalmers.se</a>></p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-pack-objects.html">git-pack-objects(1)</a> +<div class="paragraph"><p><a href="git-pack-objects.html">git-pack-objects(1)</a> <a href="git-repack.html">git-repack(1)</a> <a href="git-prune-packed.html">git-prune-packed(1)</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:51 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-pack-refs.html b/git-pack-refs.html index 5305b2b..4da3160 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-pack-refs(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-pack-refs(1)</title> </head> <body> <div id="header"> @@ -318,27 +412,27 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git pack-refs</em> [--all] [--no-prune]</p></div> +<div class="paragraph"><p><em>git pack-refs</em> [--all] [--no-prune]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Traditionally, tips of branches and tags (collectively known as +<div class="paragraph"><p>Traditionally, tips of branches and tags (collectively known as <em>refs</em>) were stored one file per ref under <tt>$GIT_DIR/refs</tt> directory. While many branch tips tend to be updated often, most tags and some branch tips are never updated. When a repository has hundreds or thousands of tags, this one-file-per-ref format both wastes storage and hurts performance.</p></div> -<div class="para"><p>This command is used to solve the storage and performance +<div class="paragraph"><p>This command is used to solve the storage and performance problem by stashing the refs in a single file, <tt>$GIT_DIR/packed-refs</tt>. When a ref is missing from the traditional <tt>$GIT_DIR/refs</tt> hierarchy, it is looked up in this file and used if found.</p></div> -<div class="para"><p>Subsequent updates to branches always create new files under +<div class="paragraph"><p>Subsequent updates to branches always create new files under <tt>$GIT_DIR/refs</tt> hierarchy.</p></div> -<div class="para"><p>A recommended practice to deal with a repository with too many +<div class="paragraph"><p>A recommended practice to deal with a repository with too many refs is to pack its refs with <tt>--all --prune</tt> once, and occasionally run <tt>git pack-refs --prune</tt>. Tags are by definition stationary and are not expected to change. Branch @@ -349,8 +443,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --all </dt> <dd> @@ -363,7 +457,7 @@ a repository with many branches of historical interests. </p> </dd> -<dt> +<dt class="hdlist1"> --no-prune </dt> <dd> @@ -376,15 +470,15 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:51 UTC +Last updated 2009-04-05 09:18:09 UTC </div> </div> </body> diff --git a/git-parse-remote.html b/git-parse-remote.html index 030c350..2c68e55 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-parse-remote(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-parse-remote(1)</title> </head> <body> <div id="header"> @@ -318,32 +412,32 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>. "$(git --exec-path)/git-parse-remote"</em></p></div> +<div class="paragraph"><p><em>. "$(git --exec-path)/git-parse-remote"</em></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This script is included in various scripts to supply +<div class="paragraph"><p>This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano.</p></div> +<div class="paragraph"><p>Written by Junio C Hamano.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:51 UTC +Last updated 2009-06-21 08:02:57 UTC </div> </div> </body> diff --git a/git-patch-id.html b/git-patch-id.html index 7174e63..c8c35b6 100644 --- a/git-patch-id.html +++ b/git-patch-id.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-patch-id(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-patch-id(1)</title> </head> <body> <div id="header"> @@ -318,18 +412,18 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git patch-id</em> < <patch></p></div> +<div class="paragraph"><p><em>git patch-id</em> < <patch></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with -whitespace and line numbers ignored. As such, it's "reasonably stable", but at +<div class="paragraph"><p>A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with +whitespace and line numbers ignored. As such, it’s "reasonably stable", but at the same time also reasonably unique, i.e., two patches that have the same "patch ID" are almost guaranteed to be the same thing.</p></div> -<div class="para"><p>IOW, you can use this thing to look for likely duplicate commits.</p></div> -<div class="para"><p>When dealing with <em>git diff-tree</em> output, it takes advantage of +<div class="paragraph"><p>IOW, you can use this thing to look for likely duplicate commits.</p></div> +<div class="paragraph"><p>When dealing with <em>git diff-tree</em> output, it takes advantage of the fact that the patch is prefixed with the object name of the commit, and outputs two 40-byte hexadecimal strings. The first string is the patch ID, and the second string is the commit ID. @@ -337,8 +431,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <patch> </dt> <dd> @@ -350,19 +444,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:51 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-peek-remote.html b/git-peek-remote.html index 89a7058..9eafaea 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-peek-remote(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-peek-remote(1)</title> </head> <body> <div id="header"> @@ -318,25 +412,25 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git peek-remote</em> [--upload-pack=<git-upload-pack>] [<host>:]<directory></p></div> +<div class="paragraph"><p><em>git peek-remote</em> [--upload-pack=<git-upload-pack>] [<host>:]<directory></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This command is deprecated; use <em>git ls-remote</em> instead.</p></div> +<div class="paragraph"><p>This command is deprecated; use <em>git ls-remote</em> instead.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --upload-pack=<git-upload-pack> </dt> <dd> <p> Use this to specify the path to <em>git-upload-pack</em> on the remote side, if it is not found on your $PATH. Some - installations of sshd ignores the user's environment + installations of sshd ignores the user’s environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set @@ -346,7 +440,7 @@ the things up in .bash_profile). </p> </dd> -<dt> +<dt class="hdlist1"> <host> </dt> <dd> @@ -356,7 +450,7 @@ ssh. </p> </dd> -<dt> +<dt class="hdlist1"> <directory> </dt> <dd> @@ -368,19 +462,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:51 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-prune-packed.html b/git-prune-packed.html index 88ff1ed..d3ee6c9 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-prune-packed(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-prune-packed(1)</title> </head> <body> <div id="header"> @@ -318,39 +412,39 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git prune-packed</em> [-n|--dry-run] [-q|--quiet]</p></div> +<div class="paragraph"><p><em>git prune-packed</em> [-n|--dry-run] [-q|--quiet]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This program searches the <tt>$GIT_OBJECT_DIR</tt> for all objects that currently +<div class="paragraph"><p>This program searches the <tt>$GIT_OBJECT_DIR</tt> for all objects that currently exist in a pack file as well as the independent object directories.</p></div> -<div class="para"><p>All such extra objects are removed.</p></div> -<div class="para"><p>A pack is a collection of objects, individually compressed, with delta +<div class="paragraph"><p>All such extra objects are removed.</p></div> +<div class="paragraph"><p>A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an associated index file.</p></div> -<div class="para"><p>Packs are used to reduce the load on mirror systems, backup engines, +<div class="paragraph"><p>Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -n </dt> -<dt> +<dt class="hdlist1"> --dry-run </dt> <dd> <p> - Don't actually remove any objects, only show those that would have been + Don’t actually remove any objects, only show those that would have been removed. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -362,24 +456,24 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Ryan Anderson <ryan@michonline.com></p></div> +<div class="paragraph"><p>Documentation by Ryan Anderson <<a href="mailto:ryan@michonline.com">ryan@michonline.com</a>></p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-pack-objects.html">git-pack-objects(1)</a> +<div class="paragraph"><p><a href="git-pack-objects.html">git-pack-objects(1)</a> <a href="git-repack.html">git-repack(1)</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:51 UTC +Last updated 2009-08-05 21:21:11 UTC </div> </div> </body> diff --git a/git-prune.html b/git-prune.html index 4909657..6b7030a 100644 --- a/git-prune.html +++ b/git-prune.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-prune(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-prune(1)</title> </head> <body> <div id="header"> @@ -318,9 +412,9 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git prune</em> [-n] [-v] [--expire <expire>] [--] [<head>…]</p></div> +<div class="paragraph"><p><em>git prune</em> [-n] [-v] [--expire <expire>] [--] [<head>…]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> @@ -333,23 +427,23 @@ <em>git prune</em>. See the section "NOTES", below.</td> </tr></table> </div> -<div class="para"><p>This runs <em>git fsck --unreachable</em> using all the refs +<div class="paragraph"><p>This runs <em>git fsck --unreachable</em> using all the refs available in <tt>refs/</tt>, optionally with additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database. In addition, it prunes the unpacked objects that are also found in packs by running <em>git prune-packed</em>.</p></div> -<div class="para"><p>Note that unreachable, packed objects will remain. If this is +<div class="paragraph"><p>Note that unreachable, packed objects will remain. If this is not desired, see <a href="git-repack.html">git-repack(1)</a>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -n </dt> -<dt> +<dt class="hdlist1"> --dry-run </dt> <dd> @@ -358,10 +452,10 @@ remove. </p> </dd> -<dt> +<dt class="hdlist1"> -v </dt> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -369,7 +463,7 @@ Report all removed objects. </p> </dd> -<dt> +<dt class="hdlist1"> -- </dt> <dd> @@ -377,7 +471,7 @@ Do not interpret any more arguments as options. </p> </dd> -<dt> +<dt class="hdlist1"> --expire <time> </dt> <dd> @@ -385,7 +479,7 @@ Only expire loose objects older than <time>. </p> </dd> -<dt> +<dt class="hdlist1"> <head>… </dt> <dd> @@ -399,7 +493,7 @@ </div> <h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> -<div class="para"><p>To prune objects not used by your repository nor another that +<div class="paragraph"><p>To prune objects not used by your repository nor another that borrows from your repository via its <tt>.git/objects/info/alternates</tt>:</p></div> <div class="listingblock"> @@ -409,33 +503,33 @@ </div> <h2 id="_notes">Notes</h2> <div class="sectionbody"> -<div class="para"><p>In most cases, users will not need to call <em>git prune</em> directly, but +<div class="paragraph"><p>In most cases, users will not need to call <em>git prune</em> directly, but should instead call <em>git gc</em>, which handles pruning along with many other housekeeping tasks.</p></div> -<div class="para"><p>For a description of which objects are considered for pruning, see +<div class="paragraph"><p>For a description of which objects are considered for pruning, see <em>git fsck</em>'s --unreachable option.</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-fsck.html">git-fsck(1)</a>, +<div class="paragraph"><p><a href="git-fsck.html">git-fsck(1)</a>, <a href="git-gc.html">git-gc(1)</a>, <a href="git-reflog.html">git-reflog(1)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:51 UTC +Last updated 2010-08-10 05:29:35 UTC </div> </div> </body> diff --git a/git-quiltimport.html b/git-quiltimport.html index 26b04f6..968f625 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-quiltimport(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-quiltimport(1)</title> </head> <body> <div id="header"> @@ -318,31 +412,33 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git quiltimport</em> [--dry-run | -n] [--author <author>] [--patches <dir>]</div></div> +<div class="verseblock-content"><em>git quiltimport</em> [--dry-run | -n] [--author <author>] [--patches <dir>]</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Applies a quilt patchset onto the current git branch, preserving +<div class="paragraph"><p>Applies a quilt patchset onto the current git branch, preserving the patch boundaries, patch order, and patch descriptions present in the quilt patchset.</p></div> -<div class="para"><p>For each patch the code attempts to extract the author from the +<div class="paragraph"><p>For each patch the code attempts to extract the author from the patch description. If that fails it falls back to the author specified with --author. If the --author flag was not given the patch description is displayed and the user is asked to interactively enter the author of the patch.</p></div> -<div class="para"><p>If a subject is not found in the patch description the patch name is +<div class="paragraph"><p>If a subject is not found in the patch description the patch name is preserved as the 1 line subject in the git description.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -n </dt> -<dt> +<dt class="hdlist1"> --dry-run </dt> <dd> @@ -353,7 +449,7 @@ information is warned about. </p> </dd> -<dt> +<dt class="hdlist1"> --author Author Name <Author Email> </dt> <dd> @@ -362,7 +458,7 @@ information can be found in the patch description. </p> </dd> -<dt> +<dt class="hdlist1"> --patches <dir> </dt> <dd> @@ -370,7 +466,7 @@ The directory to find the quilt patches and the quilt series file. </p> -<div class="para"><p>The default for the patch directory is patches +<div class="paragraph"><p>The default for the patch directory is patches or the value of the $QUILT_PATCHES environment variable.</p></div> </dd> @@ -378,19 +474,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Eric Biederman <ebiederm@lnxi.com></p></div> +<div class="paragraph"><p>Written by Eric Biederman <<a href="mailto:ebiederm@lnxi.com">ebiederm@lnxi.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Eric Biederman <ebiederm@lnxi.com></p></div> +<div class="paragraph"><p>Documentation by Eric Biederman <<a href="mailto:ebiederm@lnxi.com">ebiederm@lnxi.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:52 UTC +Last updated 2009-09-13 09:50:06 UTC </div> </div> </body> diff --git a/git-receive-pack.html b/git-receive-pack.html index f7997db..5ceca06 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-receive-pack(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-receive-pack(1)</title> </head> <body> <div id="header"> @@ -318,32 +412,32 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git-receive-pack</em> <directory></p></div> +<div class="paragraph"><p><em>git-receive-pack</em> <directory></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Invoked by <em>git send-pack</em> and updates the repository with the +<div class="paragraph"><p>Invoked by <em>git send-pack</em> and updates the repository with the information fed from the remote end.</p></div> -<div class="para"><p>This command is usually not invoked directly by the end user. +<div class="paragraph"><p>This command is usually not invoked directly by the end user. The UI for the protocol is on the <em>git send-pack</em> side, and the program pair is meant to be used to push updates to remote repository. For pull operations, see <a href="git-fetch-pack.html">git-fetch-pack(1)</a>.</p></div> -<div class="para"><p>The command allows for creation and fast-forwarding of sha1 refs +<div class="paragraph"><p>The command allows for creation and fast-forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the local end <em>git-receive-pack</em> runs, but to the user who is sitting at the send-pack end, it is updating the remote. Confused?)</p></div> -<div class="para"><p>There are other real-world examples of using update and +<div class="paragraph"><p>There are other real-world examples of using update and post-update hooks found in the Documentation/howto directory.</p></div> -<div class="para"><p><em>git-receive-pack</em> honours the receive.denyNonFastForwards config +<div class="paragraph"><p><em>git-receive-pack</em> honours the receive.denyNonFastForwards config option, which tells it if updates to a ref should be denied if they are not fast-forwards.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <directory> </dt> <dd> @@ -355,50 +449,50 @@ </div> <h2 id="_pre_receive_hook">pre-receive Hook</h2> <div class="sectionbody"> -<div class="para"><p>Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists +<div class="paragraph"><p>Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists and is executable, it will be invoked once with no parameters. The standard input of the hook will be one line per ref to be updated:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>sha1-old SP sha1-new SP refname LF</tt></pre> </div></div> -<div class="para"><p>The refname value is relative to $GIT_DIR; e.g. for the master +<div class="paragraph"><p>The refname value is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 values before each refname are the object names for the refname before and after the update. Refs to be created will have sha1-old equal to 0{40}, while refs to be deleted will have sha1-new equal to 0{40}, otherwise sha1-old and sha1-new should be valid objects in the repository.</p></div> -<div class="para"><p>This hook is called before any refname is updated and before any +<div class="paragraph"><p>This hook is called before any refname is updated and before any fast-forward checks are performed.</p></div> -<div class="para"><p>If the pre-receive hook exits with a non-zero exit status no updates +<div class="paragraph"><p>If the pre-receive hook exits with a non-zero exit status no updates will be performed, and the update, post-receive and post-update hooks will not be invoked either. This can be useful to quickly bail out if the update is not to be supported.</p></div> </div> <h2 id="_update_hook">update Hook</h2> <div class="sectionbody"> -<div class="para"><p>Before each ref is updated, if $GIT_DIR/hooks/update file exists +<div class="paragraph"><p>Before each ref is updated, if $GIT_DIR/hooks/update file exists and is executable, it is invoked once per ref, with three parameters:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>$GIT_DIR/hooks/update refname sha1-old sha1-new</tt></pre> </div></div> -<div class="para"><p>The refname parameter is relative to $GIT_DIR; e.g. for the master +<div class="paragraph"><p>The refname parameter is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 arguments are the object names for the refname before and after the update. Note that the hook is called before the refname is updated, so either sha1-old is 0{40} (meaning there is no such ref yet), or it should match what is recorded in refname.</p></div> -<div class="para"><p>The hook should exit with non-zero status if it wants to disallow +<div class="paragraph"><p>The hook should exit with non-zero status if it wants to disallow updating the named ref. Otherwise it should exit with zero.</p></div> -<div class="para"><p>Successful execution (a zero exit status) of this hook does not +<div class="paragraph"><p>Successful execution (a zero exit status) of this hook does not ensure the ref will actually be updated, it is only a prerequisite. As such it is not a good idea to send notices (e.g. email) from this hook. Consider using the post-receive hook instead.</p></div> </div> <h2 id="_post_receive_hook">post-receive Hook</h2> <div class="sectionbody"> -<div class="para"><p>After all refs were updated (or attempted to be updated), if any +<div class="paragraph"><p>After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post-receive file exists and is executable, it will be invoked once with no parameters. The standard input of the hook will be one line @@ -407,14 +501,14 @@ <div class="content"> <pre><tt>sha1-old SP sha1-new SP refname LF</tt></pre> </div></div> -<div class="para"><p>The refname value is relative to $GIT_DIR; e.g. for the master +<div class="paragraph"><p>The refname value is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 values before each refname are the object names for the refname before and after the update. Refs that were created will have sha1-old equal to 0{40}, while refs that were deleted will have sha1-new equal to 0{40}, otherwise sha1-old and sha1-new should be valid objects in the repository.</p></div> -<div class="para"><p>Using this hook, it is easy to generate mails describing the updates +<div class="paragraph"><p>Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository:</p></div> <div class="literalblock"> @@ -435,9 +529,9 @@ done exit 0</tt></pre> </div></div> -<div class="para"><p>The exit code from this hook invocation is ignored, however a +<div class="paragraph"><p>The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message.</p></div> -<div class="para"><p>Note that it is possible for refname to not have sha1-new when this +<div class="paragraph"><p>Note that it is possible for refname to not have sha1-new when this hook runs. This can easily occur if another user modifies the ref after it was updated by <em>git-receive-pack</em>, but before the hook was able to evaluate it. It is recommended that hooks rely on sha1-new @@ -445,14 +539,14 @@ </div> <h2 id="_post_update_hook">post-update Hook</h2> <div class="sectionbody"> -<div class="para"><p>After all other processing, if at least one ref was updated, and +<div class="paragraph"><p>After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated. This can be used to implement any repository wide cleanup tasks.</p></div> -<div class="para"><p>The exit code from this hook invocation is ignored; the only thing +<div class="paragraph"><p>The exit code from this hook invocation is ignored; the only thing left for <em>git-receive-pack</em> to do at that point is to exit itself anyway.</p></div> -<div class="para"><p>This hook can be used, for example, to run <tt>git update-server-info</tt> +<div class="paragraph"><p>This hook can be used, for example, to run <tt>git update-server-info</tt> if the repository is packed and is served via a dumb transport.</p></div> <div class="literalblock"> <div class="content"> @@ -462,23 +556,23 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-send-pack.html">git-send-pack(1)</a></p></div> +<div class="paragraph"><p><a href="git-send-pack.html">git-send-pack(1)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:53 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 863d5a4..f3366a9 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-remote-helpers(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-remote-helpers(1)</title> </head> <body> <div id="header"> @@ -318,65 +412,65 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git remote-<transport></em> <repository> [<URL>]</p></div> +<div class="paragraph"><p><em>git remote-<transport></em> <repository> [<URL>]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Remote helper programs are normally not used directly by end users, +<div class="paragraph"><p>Remote helper programs are normally not used directly by end users, but they are invoked by git when it needs to interact with remote repositories git does not support natively. A given helper will implement a subset of the capabilities documented here. When git needs to interact with a repository using a remote helper, it spawns -the helper as an independent process, sends commands to the helper's -standard input, and expects results from the helper's standard +the helper as an independent process, sends commands to the helper’s +standard input, and expects results from the helper’s standard output. Because a remote helper runs as an independent process from git, there is no need to re-link git to add a new helper, nor any need to link the helper with the implementation of git.</p></div> -<div class="para"><p>Every helper must support the "capabilities" command, which git will +<div class="paragraph"><p>Every helper must support the "capabilities" command, which git will use to determine what other commands the helper will accept. Other commands generally concern facilities like discovering and updating remote refs, transporting objects between the object database and the remote repository, and updating the local object store.</p></div> -<div class="para"><p>Helpers supporting the <em>fetch</em> capability can discover refs from the +<div class="paragraph"><p>Helpers supporting the <em>fetch</em> capability can discover refs from the remote repository and transfer objects reachable from those refs to the local object store. Helpers supporting the <em>push</em> capability can transfer local objects to the remote repository and update remote refs.</p></div> -<div class="para"><p>Git comes with a "curl" family of remote helpers, that handle various +<div class="paragraph"><p>Git comes with a "curl" family of remote helpers, that handle various transport protocols, such as <em>git-remote-http</em>, <em>git-remote-https</em>, <em>git-remote-ftp</em> and <em>git-remote-ftps</em>. They implement the capabilities <em>fetch</em>, <em>option</em>, and <em>push</em>.</p></div> </div> <h2 id="_invocation">INVOCATION</h2> <div class="sectionbody"> -<div class="para"><p>Remote helper programs are invoked with one or (optionally) two +<div class="paragraph"><p>Remote helper programs are invoked with one or (optionally) two arguments. The first argument specifies a remote repository as in git; it is either the name of a configured remote or a URL. The second argument specifies a URL; it is usually of the form <em><transport>://<address></em>, but any arbitrary string is possible.</p></div> -<div class="para"><p>When git encounters a URL of the form <em><transport>://<address></em>, where +<div class="paragraph"><p>When git encounters a URL of the form <em><transport>://<address></em>, where <em><transport></em> is a protocol that it cannot handle natively, it automatically invokes <em>git remote-<transport></em> with the full URL as the second argument. If such a URL is encountered directly on the command line, the first argument is the same as the second, and if it is encountered in a configured remote, the first argument is the name of that remote.</p></div> -<div class="para"><p>A URL of the form <em><transport>::<address></em> explicitly instructs git to +<div class="paragraph"><p>A URL of the form <em><transport>::<address></em> explicitly instructs git to invoke <em>git remote-<transport></em> with <em><address></em> as the second argument. If such a URL is encountered directly on the command line, the first argument is <em><address></em>, and if it is encountered in a configured remote, the first argument is the name of that remote.</p></div> -<div class="para"><p>Additionally, when a configured remote has <em>remote.<name>.vcs</em> set to +<div class="paragraph"><p>Additionally, when a configured remote has <em>remote.<name>.vcs</em> set to <em><transport></em>, git explicitly invokes <em>git remote-<transport></em> with <em><name></em> as the first argument. If set, the second argument is <em>remote.<name>.url</em>; otherwise, the second argument is omitted.</p></div> </div> <h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<div class="para"><p>Commands are given by the caller on the helper's standard input, one per line.</p></div> -<div class="vlist"><dl> -<dt> +<div class="paragraph"><p>Commands are given by the caller on the helper’s standard input, one per line.</p></div> +<div class="dlist"><dl> +<dt class="hdlist1"> <em>capabilities</em> </dt> <dd> @@ -388,7 +482,7 @@ error). </p> </dd> -<dt> +<dt class="hdlist1"> <em>list</em> </dt> <dd> @@ -400,11 +494,11 @@ the name; unrecognized attributes are ignored. The list ends with a blank line. </p> -<div class="para"><p>If <em>push</em> is supported this may be called as <em>list for-push</em> +<div class="paragraph"><p>If <em>push</em> is supported this may be called as <em>list for-push</em> to obtain the current refs prior to sending one or more <em>push</em> commands to the helper.</p></div> </dd> -<dt> +<dt class="hdlist1"> <em>option</em> <name> <value> </dt> <dd> @@ -416,9 +510,9 @@ for it). Options should be set before other commands, and may influence the behavior of those commands. </p> -<div class="para"><p>Supported if the helper has the "option" capability.</p></div> +<div class="paragraph"><p>Supported if the helper has the "option" capability.</p></div> </dd> -<dt> +<dt class="hdlist1"> <em>fetch</em> <sha1> <name> </dt> <dd> @@ -430,12 +524,12 @@ same batch are complete. Only objects which were reported in the ref list with a sha1 may be fetched this way. </p> -<div class="para"><p>Optionally may output a <em>lock <file></em> line indicating a file under +<div class="paragraph"><p>Optionally may output a <em>lock <file></em> line indicating a file under GIT_DIR/objects/pack which is keeping a pack until refs can be suitably updated.</p></div> -<div class="para"><p>Supported if the helper has the "fetch" capability.</p></div> +<div class="paragraph"><p>Supported if the helper has the "fetch" capability.</p></div> </dd> -<dt> +<dt class="hdlist1"> <em>push</em> +<src>:<dst> </dt> <dd> @@ -444,16 +538,16 @@ remote branch described by <dst>. A batch sequence of one or more push commands is terminated with a blank line. </p> -<div class="para"><p>Zero or more protocol options may be entered after the last <em>push</em> -command, before the batch's terminating blank line.</p></div> -<div class="para"><p>When the push is complete, outputs one or more <em>ok <dst></em> or +<div class="paragraph"><p>Zero or more protocol options may be entered after the last <em>push</em> +command, before the batch’s terminating blank line.</p></div> +<div class="paragraph"><p>When the push is complete, outputs one or more <em>ok <dst></em> or <em>error <dst> <why>?</em> lines to indicate success or failure of each pushed ref. The status report output is terminated by a blank line. The option field <why> may be quoted in a C style string if it contains an LF.</p></div> -<div class="para"><p>Supported if the helper has the "push" capability.</p></div> +<div class="paragraph"><p>Supported if the helper has the "push" capability.</p></div> </dd> -<dt> +<dt class="hdlist1"> <em>import</em> <name> </dt> <dd> @@ -466,11 +560,11 @@ by applying the refspecs from the "refspec" capability to the name of the ref. </p> -<div class="para"><p>Especially useful for interoperability with a foreign versioning +<div class="paragraph"><p>Especially useful for interoperability with a foreign versioning system.</p></div> -<div class="para"><p>Supported if the helper has the "import" capability.</p></div> +<div class="paragraph"><p>Supported if the helper has the "import" capability.</p></div> </dd> -<dt> +<dt class="hdlist1"> <em>connect</em> <service> </dt> <dd> @@ -481,37 +575,37 @@ as service) on remote side. Valid replies to this command are empty line (connection established), <em>fallback</em> (no smart transport support, fall back to dumb transports) and just - exiting with error message printed (can't connect, don't + exiting with error message printed (can’t connect, don’t bother trying to fall back). After line feed terminating the positive (empty) response, the output of service starts. After the connection ends, the remote helper exits. </p> -<div class="para"><p>Supported if the helper has the "connect" capability.</p></div> +<div class="paragraph"><p>Supported if the helper has the "connect" capability.</p></div> </dd> </dl></div> -<div class="para"><p>If a fatal error occurs, the program writes the error message to +<div class="paragraph"><p>If a fatal error occurs, the program writes the error message to stderr and exits. The caller should expect that a suitable error message has been printed if the child closes the connection without completing a valid response for the current command.</p></div> -<div class="para"><p>Additional commands may be supported, as may be determined from +<div class="paragraph"><p>Additional commands may be supported, as may be determined from capabilities reported by the helper.</p></div> </div> <h2 id="_capabilities">CAPABILITIES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <em>fetch</em> </dt> -<dt> +<dt class="hdlist1"> <em>option</em> </dt> -<dt> +<dt class="hdlist1"> <em>push</em> </dt> -<dt> +<dt class="hdlist1"> <em>import</em> </dt> -<dt> +<dt class="hdlist1"> <em>connect</em> </dt> <dd> @@ -519,7 +613,7 @@ This helper supports the corresponding command with the same name. </p> </dd> -<dt> +<dt class="hdlist1"> <em>refspec</em> <em>spec</em> </dt> <dd> @@ -538,8 +632,8 @@ </div> <h2 id="_ref_list_attributes">REF LIST ATTRIBUTES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <em>for-push</em> </dt> <dd> @@ -549,7 +643,7 @@ opening a different type of connection to the destination. </p> </dd> -<dt> +<dt class="hdlist1"> <em>unchanged</em> </dt> <dd> @@ -562,8 +656,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <em>option verbosity</em> <N> </dt> <dd> @@ -576,7 +670,7 @@ command line. </p> </dd> -<dt> +<dt class="hdlist1"> <em>option progress</em> {<em>true</em>|<em>false</em>} </dt> <dd> @@ -585,7 +679,7 @@ transport helper during a command. </p> </dd> -<dt> +<dt class="hdlist1"> <em>option depth</em> <depth> </dt> <dd> @@ -593,7 +687,7 @@ Deepens the history of a shallow repository. </p> </dd> -<dt> +<dt class="hdlist1"> <em>option followtags</em> {<em>true</em>|<em>false</em>} </dt> <dd> @@ -607,12 +701,12 @@ </p> </dd> </dl></div> -<div class="para"><p><em>option dry-run</em> {<em>true</em>|<em>false</em>}: +<div class="paragraph"><p><em>option dry-run</em> {<em>true</em>|<em>false</em>}: If true, pretend the operation completed successfully, - but don't actually change any repository data. For most + but don’t actually change any repository data. For most helpers this only applies to the <em>push</em>, if supported.</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <em>option servpath <c-style-quoted-path></em> </dt> <dd> @@ -627,19 +721,19 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-remote.html">git-remote(1)</a></p></div> +<div class="paragraph"><p><a href="git-remote.html">git-remote(1)</a></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Daniel Barkalow and Ilari Liusvaara</p></div> +<div class="paragraph"><p>Documentation by Daniel Barkalow and Ilari Liusvaara</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:54 UTC +Last updated 2010-04-19 06:45:57 UTC </div> </div> </body> diff --git a/git-replace.html b/git-replace.html index 11f6db9..67caee8 100644 --- a/git-replace.html +++ b/git-replace.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-replace(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-replace(1)</title> </head> <body> <div id="header"> @@ -318,44 +412,46 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git replace</em> [-f] <object> <replacement> +<div class="verseblock-content"><em>git replace</em> [-f] <object> <replacement> <em>git replace</em> -d <object>… -<em>git replace</em> -l [<pattern>]</div></div> +<em>git replace</em> -l [<pattern>]</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Adds a <em>replace</em> reference in <tt>.git/refs/replace/</tt></p></div> -<div class="para"><p>The name of the <em>replace</em> reference is the SHA1 of the object that is +<div class="paragraph"><p>Adds a <em>replace</em> reference in <tt>.git/refs/replace/</tt></p></div> +<div class="paragraph"><p>The name of the <em>replace</em> reference is the SHA1 of the object that is replaced. The content of the <em>replace</em> reference is the SHA1 of the replacement object.</p></div> -<div class="para"><p>Unless <tt>-f</tt> is given, the <em>replace</em> reference must not yet exist in +<div class="paragraph"><p>Unless <tt>-f</tt> is given, the <em>replace</em> reference must not yet exist in <tt>.git/refs/replace/</tt> directory.</p></div> -<div class="para"><p>Replacement references will be used by default by all git commands +<div class="paragraph"><p>Replacement references will be used by default by all git commands except those doing reachability traversal (prune, pack transfer and fsck).</p></div> -<div class="para"><p>It is possible to disable use of replacement references for any +<div class="paragraph"><p>It is possible to disable use of replacement references for any command using the <tt>--no-replace-objects</tt> option just after <em>git</em>.</p></div> -<div class="para"><p>For example if commit <em>foo</em> has been replaced by commit <em>bar</em>:</p></div> +<div class="paragraph"><p>For example if commit <em>foo</em> has been replaced by commit <em>bar</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git --no-replace-objects cat-file commit foo</tt></pre> </div></div> -<div class="para"><p>shows information about commit <em>foo</em>, while:</p></div> +<div class="paragraph"><p>shows information about commit <em>foo</em>, while:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git cat-file commit foo</tt></pre> </div></div> -<div class="para"><p>shows information about commit <em>bar</em>.</p></div> -<div class="para"><p>The <em>GIT_NO_REPLACE_OBJECTS</em> environment variable can be set to +<div class="paragraph"><p>shows information about commit <em>bar</em>.</p></div> +<div class="paragraph"><p>The <em>GIT_NO_REPLACE_OBJECTS</em> environment variable can be set to achieve the same effect as the <tt>--no-replace-objects</tt> option.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -f </dt> <dd> @@ -364,7 +460,7 @@ be overwritten (instead of failing). </p> </dd> -<dt> +<dt class="hdlist1"> -d </dt> <dd> @@ -372,7 +468,7 @@ Delete existing replace refs for the given objects. </p> </dd> -<dt> +<dt class="hdlist1"> -l <pattern> </dt> <dd> @@ -387,39 +483,39 @@ </div> <h2 id="_bugs">BUGS</h2> <div class="sectionbody"> -<div class="para"><p>Comparing blobs or trees that have been replaced with those that +<div class="paragraph"><p>Comparing blobs or trees that have been replaced with those that replace them will not work properly. And using <tt>git reset --hard</tt> to go back to a replaced commit will move the branch to the replacement commit instead of the replaced commit.</p></div> -<div class="para"><p>There may be other problems when using <em>git rev-list</em> related to +<div class="paragraph"><p>There may be other problems when using <em>git rev-list</em> related to pending objects. And of course things may break if an object of one type is replaced by an object of another type (for example a blob replaced by a commit).</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-tag.html">git-tag(1)</a> +<div class="paragraph"><p><a href="git-tag.html">git-tag(1)</a> <a href="git-branch.html">git-branch(1)</a> <a href="git.html">git(1)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Christian Couder <chriscool@tuxfamily.org> and Junio C -Hamano <gitster@pobox.com>, based on <em>git tag</em> by Kristian Hogsberg -<krh@redhat.com> and Carlos Rica <jasampler@gmail.com>.</p></div> +<div class="paragraph"><p>Written by Christian Couder <<a href="mailto:chriscool@tuxfamily.org">chriscool@tuxfamily.org</a>> and Junio C +Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>>, based on <em>git tag</em> by Kristian Hogsberg +<<a href="mailto:krh@redhat.com">krh@redhat.com</a>> and Carlos Rica <<a href="mailto:jasampler@gmail.com">jasampler@gmail.com</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Christian Couder <chriscool@tuxfamily.org> and the -git-list <git@vger.kernel.org>, based on <em>git tag</em> documentation.</p></div> +<div class="paragraph"><p>Documentation by Christian Couder <<a href="mailto:chriscool@tuxfamily.org">chriscool@tuxfamily.org</a>> and the +git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>, based on <em>git tag</em> documentation.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:54 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-repo-config.html b/git-repo-config.html index efb2334..656a2c3 100644 --- a/git-repo-config.html +++ b/git-repo-config.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-repo-config(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-repo-config(1)</title> </head> <body> <div id="header"> @@ -318,18 +412,18 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git repo-config</em> …</p></div> +<div class="paragraph"><p><em>git repo-config</em> …</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This is a synonym for <a href="git-config.html">git-config(1)</a>. Please refer to the +<div class="paragraph"><p>This is a synonym for <a href="git-config.html">git-config(1)</a>. Please refer to the documentation of that command.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:55 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-request-pull.html b/git-request-pull.html index 90515c6..539a3f7 100644 --- a/git-request-pull.html +++ b/git-request-pull.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-request-pull(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-request-pull(1)</title> </head> <body> <div id="header"> @@ -318,19 +412,19 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git request-pull</em> [-p] <start> <url> [<end>]</p></div> +<div class="paragraph"><p><em>git request-pull</em> [-p] <start> <url> [<end>]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Summarizes the changes between two commits to the standard output, and includes +<div class="paragraph"><p>Summarizes the changes between two commits to the standard output, and includes the given URL in the generated summary.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -p </dt> <dd> @@ -338,7 +432,7 @@ Show patch text </p> </dd> -<dt> +<dt class="hdlist1"> <start> </dt> <dd> @@ -346,7 +440,7 @@ Commit to start at. </p> </dd> -<dt> +<dt class="hdlist1"> <url> </dt> <dd> @@ -354,7 +448,7 @@ URL to include in the summary. </p> </dd> -<dt> +<dt class="hdlist1"> <end> </dt> <dd> @@ -366,19 +460,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Ryan Anderson <<a href="mailto:ryan@michonline.com">ryan@michonline.com</a>> and Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:55 UTC +Last updated 2010-07-26 09:02:09 UTC </div> </div> </body> diff --git a/git-rerere.html b/git-rerere.html index 23e3980..c1119b2 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-rerere(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-rerere(1)</title> </head> <body> <div id="header"> @@ -318,17 +412,17 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> [<pathspec>]|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div> +<div class="paragraph"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> [<pathspec>]|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>In a workflow employing relatively long lived topic branches, +<div class="paragraph"><p>In a workflow employing relatively long lived topic branches, the developer sometimes needs to resolve the same conflicts over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream).</p></div> -<div class="para"><p>This command assists the developer in this process by recording +<div class="paragraph"><p>This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results.</p></div> @@ -344,11 +438,11 @@ </div> <h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<div class="para"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention. +<div class="paragraph"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state.</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <em>clear</em> </dt> <dd> @@ -358,7 +452,7 @@ will automatically invoke this command. </p> </dd> -<dt> +<dt class="hdlist1"> <em>forget</em> <pathspec> </dt> <dd> @@ -367,7 +461,7 @@ conflict in <pathspec>. The <pathspec> is optional. </p> </dd> -<dt> +<dt class="hdlist1"> <em>diff</em> </dt> <dd> @@ -378,7 +472,7 @@ <em>diff</em> command installed in PATH. </p> </dd> -<dt> +<dt class="hdlist1"> <em>status</em> </dt> <dd> @@ -387,7 +481,7 @@ for resolutions. </p> </dd> -<dt> +<dt class="hdlist1"> <em>gc</em> </dt> <dd> @@ -404,7 +498,7 @@ </div> <h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<div class="para"><p>When your topic branch modifies an overlapping area that your +<div class="paragraph"><p>When your topic branch modifies an overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, even before your topic branch is ready to be pushed upstream:</p></div> @@ -414,7 +508,7 @@ / o---o---o---*---o---o master</tt></pre> </div></div> -<div class="para"><p>For such a test, you need to merge master and topic somehow. +<div class="paragraph"><p>For such a test, you need to merge master and topic somehow. One way to do it is to pull master into the topic branch:</p></div> <div class="listingblock"> <div class="content"> @@ -425,11 +519,11 @@ / / o---o---o---*---o---o master</tt></pre> </div></div> -<div class="para"><p>The commits marked with <tt>*</tt> touch the same area in the same +<div class="paragraph"><p>The commits marked with <tt>*</tt> touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with <tt>+</tt>. Then you can test the result to make sure your work-in-progress still works with what is in the latest master.</p></div> -<div class="para"><p>After this test merge, there are two ways to continue your work +<div class="paragraph"><p>After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge commit <tt>+</tt>, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the @@ -448,13 +542,13 @@ / / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> -<div class="para"><p>When your topic branch is long-lived, however, your topic branch +<div class="paragraph"><p>When your topic branch is long-lived, however, your topic branch would end up having many such "Merge from master" commits on it, which would unnecessarily clutter the development history. Readers of the Linux kernel mailing list may remember that Linus complained about such too frequent test merges when a subsystem maintainer asked to pull from a branch full of "useless merges".</p></div> -<div class="para"><p>As an alternative, to keep the topic branch clean of test +<div class="paragraph"><p>As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on top of the tip before the test merge:</p></div> <div class="listingblock"> @@ -470,7 +564,7 @@ / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> -<div class="para"><p>This would leave only one merge commit when your topic branch is +<div class="paragraph"><p>This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the commits marked with <tt>*</tt>. However, this conflict is often the @@ -478,14 +572,14 @@ blew away. <em>git rerere</em> helps you resolve this final conflicted merge using the information from your earlier hand resolve.</p></div> -<div class="para"><p>Running the <em>git rerere</em> command immediately after a conflicted +<div class="paragraph"><p>Running the <em>git rerere</em> command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in them. Later, after you are done resolving the conflicts, running <em>git rerere</em> again will record the resolved state of these files. Suppose you did this when you created the test merge of master into the topic branch.</p></div> -<div class="para"><p>Next time, after seeing the same conflicted automerge, +<div class="paragraph"><p>Next time, after seeing the same conflicted automerge, running <em>git rerere</em> will perform a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge. @@ -494,18 +588,18 @@ resolve it. Note that <em>git rerere</em> leaves the index file alone, so you still need to do the final sanity checks with <tt>git diff</tt> (or <tt>git diff -c</tt>) and <em>git add</em> when you are satisfied.</p></div> -<div class="para"><p>As a convenience measure, <em>git merge</em> automatically invokes +<div class="paragraph"><p>As a convenience measure, <em>git merge</em> automatically invokes <em>git rerere</em> upon exiting with a failed automerge and <em>git rerere</em> records the hand resolve when it is a new conflict, or reuses the earlier hand resolve when it is not. <em>git commit</em> also invokes <em>git rerere</em> when committing a merge result. What this means is that you do not have to do anything special yourself (besides enabling the rerere.enabled config variable).</p></div> -<div class="para"><p>In our example, when you do the test merge, the manual +<div class="paragraph"><p>In our example, when you do the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with the updated master and topic branch, as long as the recorded resolution is still applicable.</p></div> -<div class="para"><p>The information <em>git rerere</em> records is also used when running +<div class="paragraph"><p>The information <em>git rerere</em> records is also used when running <em>git rebase</em>. After blowing away the test merge and continuing development on the topic branch:</p></div> <div class="listingblock"> @@ -520,7 +614,7 @@ / o---o---o---*---o---o---o---o master</tt></pre> </div></div> -<div class="para"><p>you could run <tt>git rebase master topic</tt>, to bring yourself +<div class="paragraph"><p>you could run <tt>git rebase master topic</tt>, to bring yourself up-to-date before your topic is ready to be sent upstream. This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier. @@ -529,15 +623,15 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:55 UTC +Last updated 2010-07-05 23:25:05 UTC </div> </div> </body> diff --git a/git-send-pack.html b/git-send-pack.html index 41ec1f1..fb2ce84 100644 --- a/git-send-pack.html +++ b/git-send-pack.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-send-pack(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-send-pack(1)</title> </head> <body> <div id="header"> @@ -318,21 +412,21 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git send-pack</em> [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>…]</p></div> +<div class="paragraph"><p><em>git send-pack</em> [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>…]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Usually you would want to use <em>git push</em>, which is a +<div class="paragraph"><p>Usually you would want to use <em>git push</em>, which is a higher-level wrapper of this command, instead. See <a href="git-push.html">git-push(1)</a>.</p></div> -<div class="para"><p>Invokes <em>git-receive-pack</em> on a possibly remote repository, and +<div class="paragraph"><p>Invokes <em>git-receive-pack</em> on a possibly remote repository, and updates it from the current repository, sending named refs.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --receive-pack=<git-receive-pack> </dt> <dd> @@ -343,7 +437,7 @@ a directory on the default $PATH. </p> </dd> -<dt> +<dt class="hdlist1"> --exec=<git-receive-pack> </dt> <dd> @@ -351,7 +445,7 @@ Same as --receive-pack=<git-receive-pack>. </p> </dd> -<dt> +<dt class="hdlist1"> --all </dt> <dd> @@ -360,7 +454,7 @@ update all heads that locally exist. </p> </dd> -<dt> +<dt class="hdlist1"> --dry-run </dt> <dd> @@ -368,7 +462,7 @@ Do everything except actually send the updates. </p> </dd> -<dt> +<dt class="hdlist1"> --force </dt> <dd> @@ -380,7 +474,7 @@ care. </p> </dd> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -388,7 +482,7 @@ Run verbosely. </p> </dd> -<dt> +<dt class="hdlist1"> --thin </dt> <dd> @@ -397,7 +491,7 @@ on objects not included in the pack to reduce network traffic. </p> </dd> -<dt> +<dt class="hdlist1"> <host> </dt> <dd> @@ -407,7 +501,7 @@ ssh. </p> </dd> -<dt> +<dt class="hdlist1"> <directory> </dt> <dd> @@ -415,7 +509,7 @@ The repository to update. </p> </dd> -<dt> +<dt class="hdlist1"> <ref>… </dt> <dd> @@ -427,25 +521,25 @@ </div> <h2 id="_specifying_the_refs">Specifying the Refs</h2> <div class="sectionbody"> -<div class="para"><p>There are three ways to specify which refs to update on the +<div class="paragraph"><p>There are three ways to specify which refs to update on the remote end.</p></div> -<div class="para"><p>With <em>--all</em> flag, all refs that exist locally are transferred to +<div class="paragraph"><p>With <em>--all</em> flag, all refs that exist locally are transferred to the remote side. You cannot specify any <em><ref></em> if you use this flag.</p></div> -<div class="para"><p>Without <em>--all</em> and without any <em><ref></em>, the heads that exist +<div class="paragraph"><p>Without <em>--all</em> and without any <em><ref></em>, the heads that exist both on the local side and on the remote side are updated.</p></div> -<div class="para"><p>When one or more <em><ref></em> are specified explicitly, it can be either a +<div class="paragraph"><p>When one or more <em><ref></em> are specified explicitly, it can be either a single pattern, or a pair of such pattern separated by a colon ":" (this means that a ref name cannot have a colon in it). A single pattern <em><name></em> is just a shorthand for <em><name>:<name></em>.</p></div> -<div class="para"><p>Each pattern pair consists of the source side (before the colon) +<div class="paragraph"><p>Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side. The rules used to match a ref are the same rules used by <em>git rev-parse</em> to resolve a symbolic ref name. See <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> It is an error if <src> does not match exactly one of the @@ -461,7 +555,7 @@ <p> If <dst> does not match any remote ref, either </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> it has to start with "refs/"; <dst> is used as the @@ -478,30 +572,30 @@ </ul></div> </li> </ul></div> -<div class="para"><p>Without <em>--force</em>, the <src> ref is stored at the remote only if +<div class="paragraph"><p>Without <em>--force</em>, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This check, known as "fast-forward check", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples' commits from there.</p></div> -<div class="para"><p>With <em>--force</em>, the fast-forward check is disabled for all refs.</p></div> -<div class="para"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign +<div class="paragraph"><p>With <em>--force</em>, the fast-forward check is disabled for all refs.</p></div> +<div class="paragraph"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign to disable the fast-forward check only on that ref.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:57 UTC +Last updated 2010-02-19 09:57:41 UTC </div> </div> </body> diff --git a/git-sh-setup.html b/git-sh-setup.html index 056735b..17da6fe 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-sh-setup(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-sh-setup(1)</title> </head> <body> <div id="header"> @@ -318,30 +412,30 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>. "$(git --exec-path)/git-sh-setup"</em></p></div> +<div class="paragraph"><p><em>. "$(git --exec-path)/git-sh-setup"</em></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This is not a command the end user would want to run. Ever. +<div class="paragraph"><p>This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones.</p></div> -<div class="para"><p>The <em>git sh-setup</em> scriptlet is designed to be sourced (using +<div class="paragraph"><p>The <em>git sh-setup</em> scriptlet is designed to be sourced (using <tt>.</tt>) by other shell scripts to set up some variables pointing at the normal git directories and a few helper shell functions.</p></div> -<div class="para"><p>Before sourcing it, your script should set up a few variables; +<div class="paragraph"><p>Before sourcing it, your script should set up a few variables; <tt>USAGE</tt> (and <tt>LONG_USAGE</tt>, if any) is used to define message given by <tt>usage()</tt> shell function. <tt>SUBDIRECTORY_OK</tt> can be set if the script can run from a subdirectory of the working tree (some commands do not).</p></div> -<div class="para"><p>The scriptlet sets <tt>GIT_DIR</tt> and <tt>GIT_OBJECT_DIRECTORY</tt> shell +<div class="paragraph"><p>The scriptlet sets <tt>GIT_DIR</tt> and <tt>GIT_OBJECT_DIRECTORY</tt> shell variables, but does <strong>not</strong> export them to the environment.</p></div> </div> <h2 id="_functions">FUNCTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> die </dt> <dd> @@ -350,7 +444,7 @@ standard error stream. </p> </dd> -<dt> +<dt class="hdlist1"> usage </dt> <dd> @@ -358,7 +452,7 @@ die with the usage message. </p> </dd> -<dt> +<dt class="hdlist1"> set_reflog_action </dt> <dd> @@ -368,17 +462,17 @@ ref. </p> </dd> -<dt> +<dt class="hdlist1"> git_editor </dt> <dd> <p> - runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or + runs an editor of user’s choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) on a given file, but error out if no editor is specified and the terminal is dumb. </p> </dd> -<dt> +<dt class="hdlist1"> is_bare_repository </dt> <dd> @@ -388,7 +482,7 @@ (i.e. without an associated working tree). </p> </dd> -<dt> +<dt class="hdlist1"> cd_to_toplevel </dt> <dd> @@ -396,7 +490,7 @@ runs chdir to the toplevel of the working tree. </p> </dd> -<dt> +<dt class="hdlist1"> require_work_tree </dt> <dd> @@ -406,7 +500,7 @@ (e.g. <tt>checkout</tt>). </p> </dd> -<dt> +<dt class="hdlist1"> get_author_ident_from_commit </dt> <dd> @@ -419,19 +513,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:58 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-shell.html b/git-shell.html index 19ed9db..47f63f8 100644 --- a/git-shell.html +++ b/git-shell.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-shell(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-shell(1)</title> </head> <body> <div id="header"> @@ -318,40 +412,40 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git shell</em> [-c <command> <argument>]</p></div> +<div class="paragraph"><p><em>git shell</em> [-c <command> <argument>]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>A login shell for SSH accounts to provide restricted Git access. When +<div class="paragraph"><p>A login shell for SSH accounts to provide restricted Git access. When <em>-c</em> is given, the program executes <command> non-interactively; <command> can be one of <em>git receive-pack</em>, <em>git upload-pack</em>, <em>git upload-archive</em>, <em>cvs server</em>, or a command in COMMAND_DIR. The shell is started in interactive mode when no arguments are given; in this case, COMMAND_DIR must exist, and any of the executables in it can be invoked.</p></div> -<div class="para"><p><em>cvs server</em> is a special command which executes git-cvsserver.</p></div> -<div class="para"><p>COMMAND_DIR is the path "$HOME/git-shell-commands". The user must have +<div class="paragraph"><p><em>cvs server</em> is a special command which executes git-cvsserver.</p></div> +<div class="paragraph"><p>COMMAND_DIR is the path "$HOME/git-shell-commands". The user must have read and execute permissions to the directory in order to execute the programs in it. The programs are executed with a cwd of $HOME, and <argument> is parsed as a command-line string.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Petr Baudis and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-30 00:02:59 UTC +Last updated 2010-09-30 00:01:59 UTC </div> </div> </body> diff --git a/git-show-index.html b/git-show-index.html index 6de0b0d..fcf116c 100644 --- a/git-show-index.html +++ b/git-show-index.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-show-index(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-show-index(1)</title> </head> <body> <div id="header"> @@ -318,33 +412,33 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git show-index</em> < idx-file</p></div> +<div class="paragraph"><p><em>git show-index</em> < idx-file</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Reads given idx file for packed git archive created with +<div class="paragraph"><p>Reads given idx file for packed git archive created with <em>git pack-objects</em> command, and dumps its contents.</p></div> -<div class="para"><p>The information it outputs is subset of what you can get from +<div class="paragraph"><p>The information it outputs is subset of what you can get from <em>git verify-pack -v</em>; this command only shows the packfile offset and SHA1 of each object.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:57 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-stage.html b/git-stage.html index 1f58b6c..7cef779 100644 --- a/git-stage.html +++ b/git-stage.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-stage(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-stage(1)</title> </head> <body> <div id="header"> @@ -318,19 +412,21 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git stage</em> args…</div></div> +<div class="verseblock-content"><em>git stage</em> args…</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This is a synonym for <a href="git-add.html">git-add(1)</a>. Please refer to the +<div class="paragraph"><p>This is a synonym for <a href="git-add.html">git-add(1)</a>. Please refer to the documentation of that command.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:58 UTC +Last updated 2008-12-03 03:50:54 UTC </div> </div> </body> diff --git a/git-stash.html b/git-stash.html index a720fe6..3ed1da0 100644 --- a/git-stash.html +++ b/git-stash.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-stash(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-stash(1)</title> </head> <body> <div id="header"> @@ -318,32 +412,34 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git stash</em> list [<options>] +<div class="verseblock-content"><em>git stash</em> list [<options>] <em>git stash</em> show [<stash>] <em>git stash</em> drop [-q|--quiet] [<stash>] <em>git stash</em> ( pop | apply ) [--index] [-q|--quiet] [<stash>] <em>git stash</em> branch <branchname> [<stash>] <em>git stash</em> [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] <em>git stash</em> clear -<em>git stash</em> create</div></div> +<em>git stash</em> create</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Use <tt>git stash</tt> when you want to record the current state of the +<div class="paragraph"><p>Use <tt>git stash</tt> when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the <tt>HEAD</tt> commit.</p></div> -<div class="para"><p>The modifications stashed away by this command can be listed with +<div class="paragraph"><p>The modifications stashed away by this command can be listed with <tt>git stash list</tt>, inspected with <tt>git stash show</tt>, and restored (potentially on top of a different commit) with <tt>git stash apply</tt>. Calling <tt>git stash</tt> without any arguments is equivalent to <tt>git stash save</tt>. A stash is by default listed as "WIP on <em>branchname</em> …", but you can give a more descriptive message on the command line when you create one.</p></div> -<div class="para"><p>The latest stash you created is stored in <tt>refs/stash</tt>; older +<div class="paragraph"><p>The latest stash you created is stored in <tt>refs/stash</tt>; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. <tt>stash@{0}</tt> is the most recently created stash, <tt>stash@{1}</tt> is the one before it, <tt>stash@{2.hours.ago}</tt> @@ -351,8 +447,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>] </dt> <dd> @@ -360,22 +456,22 @@ Save your local modifications to a new <em>stash</em>, and run <tt>git reset --hard</tt> to revert them. The <message> part is optional and gives the description along with the stashed state. For quickly making - a snapshot, you can omit _both_ "save" and <message>, but giving + a snapshot, you can omit <em>both</em> "save" and <message>, but giving only <message> does not trigger this action to prevent a misspelled subcommand from making an unwanted stash. </p> -<div class="para"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the +<div class="paragraph"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the index are left intact.</p></div> -<div class="para"><p>With <tt>--patch</tt>, you can interactively select hunks from in the diff +<div class="paragraph"><p>With <tt>--patch</tt>, you can interactively select hunks from in the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree.</p></div> -<div class="para"><p>The <tt>--patch</tt> option implies <tt>--keep-index</tt>. You can use +<div class="paragraph"><p>The <tt>--patch</tt> option implies <tt>--keep-index</tt>. You can use <tt>--no-keep-index</tt> to override this.</p></div> </dd> -<dt> +<dt class="hdlist1"> list [<options>] </dt> <dd> @@ -391,10 +487,10 @@ <pre><tt>stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation stash@{1}: On master: 9cc0589... Add git-stash</tt></pre> </div></div> -<div class="para"><p>The command takes options applicable to the <em>git log</em> +<div class="paragraph"><p>The command takes options applicable to the <em>git log</em> command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p></div> </dd> -<dt> +<dt class="hdlist1"> show [<stash>] </dt> <dd> @@ -406,7 +502,7 @@ -p stash@{1}</tt> to view the second most recent stash in patch form). </p> </dd> -<dt> +<dt class="hdlist1"> pop [--index] [-q|--quiet] [<stash>] </dt> <dd> @@ -416,17 +512,17 @@ operation of <tt>git stash save</tt>. The working directory must match the index. </p> -<div class="para"><p>Applying the state can fail with conflicts; in this case, it is not +<div class="paragraph"><p>Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call <tt>git stash drop</tt> manually afterwards.</p></div> -<div class="para"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working -tree's changes, but also the index's ones. However, this can fail, when you +<div class="paragraph"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working +tree’s changes, but also the index’s ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally).</p></div> -<div class="para"><p>When no <tt><stash></tt> is given, <tt>stash@{0}</tt> is assumed, otherwise <tt><stash></tt> must +<div class="paragraph"><p>When no <tt><stash></tt> is given, <tt>stash@{0}</tt> is assumed, otherwise <tt><stash></tt> must be a reference of the form <tt>stash@{<revision>}</tt>.</p></div> </dd> -<dt> +<dt class="hdlist1"> apply [--index] [-q|--quiet] [<stash>] </dt> <dd> @@ -436,7 +532,7 @@ <tt>stash save</tt> or <tt>stash create</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> branch <branchname> [<stash>] </dt> <dd> @@ -448,13 +544,13 @@ <tt>stash@{<revision>}</tt>, it then drops the <tt><stash></tt>. When no <tt><stash></tt> is given, applies the latest one. </p> -<div class="para"><p>This is useful if the branch on which you ran <tt>git stash save</tt> has +<div class="paragraph"><p>This is useful if the branch on which you ran <tt>git stash save</tt> has changed enough that <tt>git stash apply</tt> fails due to conflicts. Since the stash is applied on top of the commit that was HEAD at the time <tt>git stash</tt> was run, it restores the originally stashed state with no conflicts.</p></div> </dd> -<dt> +<dt class="hdlist1"> clear </dt> <dd> @@ -464,7 +560,7 @@ <em>Examples</em> below for a possible strategy). </p> </dd> -<dt> +<dt class="hdlist1"> drop [-q|--quiet] [<stash>] </dt> <dd> @@ -475,7 +571,7 @@ <tt>stash@{<revision>}</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> create </dt> <dd> @@ -488,7 +584,7 @@ </div> <h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<div class="para"><p>A stash is represented as a commit whose tree records the state of the +<div class="paragraph"><p>A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at <tt>HEAD</tt> when the stash was created. The tree of the second parent records the state of the index when the stash is made, and it is made a child of @@ -499,14 +595,14 @@ / / -----H----I</tt></pre> </div></div> -<div class="para"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state +<div class="paragraph"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state of the index, and <tt>W</tt> is a commit that records the state of the working tree.</p></div> </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> Pulling into a dirty tree </dt> <dd> @@ -516,7 +612,7 @@ doing. When your local changes do not conflict with the changes in the upstream, a simple <tt>git pull</tt> will let you move forward. </p> -<div class="para"><p>However, there are cases in which your local changes do conflict with +<div class="paragraph"><p>However, there are cases in which your local changes do conflict with the upstream changes, and <tt>git pull</tt> refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:</p></div> @@ -530,7 +626,7 @@ $ git stash pop</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> Interrupted workflow </dt> <dd> @@ -552,7 +648,7 @@ $ git reset --soft HEAD^ # ... continue hacking ...</tt></pre> </div></div> -<div class="para"><p>You can use <em>git stash</em> to simplify the above, like this:</p></div> +<div class="paragraph"><p>You can use <em>git stash</em> to simplify the above, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt># ... hack hack hack ... @@ -563,7 +659,7 @@ # ... continue hacking ...</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> Testing partial commits </dt> <dd> @@ -585,7 +681,7 @@ $ git commit foo -m 'Remaining parts'</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> Recovering stashes that were cleared/dropped erroneously </dt> <dd> @@ -606,22 +702,22 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-checkout.html">git-checkout(1)</a>, +<div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>, <a href="git-commit.html">git-commit(1)</a>, <a href="git-reflog.html">git-reflog(1)</a>, <a href="git-reset.html">git-reset(1)</a></p></div> </div> <h2 id="_author">AUTHOR</h2> <div class="sectionbody"> -<div class="para"><p>Written by Nanako Shiraishi <nanako3@bluebottle.com></p></div> +<div class="paragraph"><p>Written by Nanako Shiraishi <<a href="mailto:nanako3@bluebottle.com">nanako3@bluebottle.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:58 UTC +Last updated 2010-09-04 16:22:43 UTC </div> </div> </body> diff --git a/git-status.html b/git-status.html index ea7d037..b262a7b 100644 --- a/git-status.html +++ b/git-status.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-status(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-status(1)</title> </head> <body> <div id="header"> @@ -318,27 +412,27 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git status</em> [<options>…] [--] [<pathspec>…]</p></div> +<div class="paragraph"><p><em>git status</em> [<options>…] [--] [<pathspec>…]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Displays paths that have differences between the index file and the +<div class="paragraph"><p>Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the working tree and the index file, and paths in the working tree that are not tracked by git (and are not ignored by <a href="gitignore.html">gitignore(5)</a>). The first -are what you _would_ commit by running <tt>git commit</tt>; the second and -third are what you _could_ commit by running <em>git add</em> before running +are what you <em>would</em> commit by running <tt>git commit</tt>; the second and +third are what you <em>could</em> commit by running <em>git add</em> before running <tt>git commit</tt>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -s </dt> -<dt> +<dt class="hdlist1"> --short </dt> <dd> @@ -346,10 +440,10 @@ Give the output in the short-format. </p> </dd> -<dt> +<dt class="hdlist1"> -b </dt> -<dt> +<dt class="hdlist1"> --branch </dt> <dd> @@ -357,7 +451,7 @@ Show the branch and tracking info even in short-format. </p> </dd> -<dt> +<dt class="hdlist1"> --porcelain </dt> <dd> @@ -367,19 +461,19 @@ not to change in the future, making it safe for scripts. </p> </dd> -<dt> +<dt class="hdlist1"> -u[<mode>] </dt> -<dt> +<dt class="hdlist1"> --untracked-files[=<mode>] </dt> <dd> <p> Show untracked files (Default: <em>all</em>). </p> -<div class="para"><p>The mode parameter is optional, and is used to specify +<div class="paragraph"><p>The mode parameter is optional, and is used to specify the handling of untracked files. The possible options are:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <em>no</em> - Show no untracked files @@ -396,11 +490,11 @@ </p> </li> </ul></div> -<div class="para"><p>See <a href="git-config.html">git-config(1)</a> for configuration variable +<div class="paragraph"><p>See <a href="git-config.html">git-config(1)</a> for configuration variable used to change the default for when the option is not specified.</p></div> </dd> -<dt> +<dt class="hdlist1"> --ignore-submodules[=<when>] </dt> <dd> @@ -420,7 +514,7 @@ <tt>status.submodulesummary</tt> is set). </p> </dd> -<dt> +<dt class="hdlist1"> -z </dt> <dd> @@ -433,37 +527,37 @@ </div> <h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<div class="para"><p>The output from this command is designed to be used as a commit +<div class="paragraph"><p>The output from this command is designed to be used as a commit template comment, and all the output lines are prefixed with <em>#</em>. The default, long format, is designed to be human readable, verbose and descriptive. They are subject to change in any time.</p></div> -<div class="para"><p>The paths mentioned in the output, unlike many other git commands, are +<div class="paragraph"><p>The paths mentioned in the output, unlike many other git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below.</p></div> -<div class="para"><p>In short-format, the status of each path is shown as</p></div> +<div class="paragraph"><p>In short-format, the status of each path is shown as</p></div> <div class="literalblock"> <div class="content"> <pre><tt>XY PATH1 -> PATH2</tt></pre> </div></div> -<div class="para"><p>where <tt>PATH1</tt> is the path in the <tt>HEAD</tt>, and <tt> -> PATH2</tt> part is +<div class="paragraph"><p>where <tt>PATH1</tt> is the path in the <tt>HEAD</tt>, and ` → PATH2` part is shown only when <tt>PATH1</tt> corresponds to a different path in the index/worktree (i.e. the file is renamed). The <em>XY</em> is a two-letter status code.</p></div> -<div class="para"><p>The fields (including the <tt>-></tt>) are separated from each other by a +<div class="paragraph"><p>The fields (including the <tt>→</tt>) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped.</p></div> -<div class="para"><p>For paths with merge conflicts, <tt>X</tt> and <em>Y</em> show the modification +<div class="paragraph"><p>For paths with merge conflicts, <tt>X</tt> and <em>Y</em> show the modification states of each side of the merge. For paths that do not have merge conflicts, <tt>X</tt> shows the status of the index, and <tt>Y</tt> shows the status of the work tree. For untracked paths, <tt>XY</tt> are <tt>??</tt>. Other status codes can be interpreted as follows:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<em> </em> = unmodified +' ' = unmodified </p> </li> <li> @@ -497,7 +591,7 @@ </p> </li> </ul></div> -<div class="para"><p>Ignored files are not listed.</p></div> +<div class="paragraph"><p>Ignored files are not listed.</p></div> <div class="literalblock"> <div class="content"> <pre><tt>X Y Meaning @@ -523,12 +617,12 @@ ? ? untracked -------------------------------------------------</tt></pre> </div></div> -<div class="para"><p>If -b is used the short-format status is preceded by a line</p></div> -<div class="para"><p>## branchname tracking info</p></div> -<div class="para"><p>There is an alternate -z format recommended for machine parsing. In +<div class="paragraph"><p>If -b is used the short-format status is preceded by a line</p></div> +<div class="paragraph"><p>## branchname tracking info</p></div> +<div class="paragraph"><p>There is an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things -change. First, the <em>-></em> is omitted from rename entries and the field -order is reversed (e.g <em>from -> to</em> becomes <em>to from</em>). Second, a NUL +change. First, the <em>→</em> is omitted from rename entries and the field +order is reversed (e.g <em>from → to</em> becomes <em>to from</em>). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special @@ -537,37 +631,37 @@ </div> <h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<div class="para"><p>The command honors <tt>color.status</tt> (or <tt>status.color</tt> — they +<div class="paragraph"><p>The command honors <tt>color.status</tt> (or <tt>status.color</tt> — they mean the same thing and the latter is kept for backward compatibility) and <tt>color.status.<slot></tt> configuration variables to colorize its output.</p></div> -<div class="para"><p>If the config variable <tt>status.relativePaths</tt> is set to false, then all +<div class="paragraph"><p>If the config variable <tt>status.relativePaths</tt> is set to false, then all paths shown are relative to the repository root, not to the current directory.</p></div> -<div class="para"><p>If <tt>status.submodulesummary</tt> is set to a non zero number or true (identical +<div class="paragraph"><p>If <tt>status.submodulesummary</tt> is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>).</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="gitignore.html">gitignore(5)</a></p></div> +<div class="paragraph"><p><a href="gitignore.html">gitignore(5)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com>.</p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>>.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:58 UTC +Last updated 2010-08-18 22:14:44 UTC </div> </div> </body> diff --git a/git-stripspace.html b/git-stripspace.html index 86449d8..fc64cbc 100644 --- a/git-stripspace.html +++ b/git-stripspace.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-stripspace(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-stripspace(1)</title> </head> <body> <div id="header"> @@ -318,21 +412,21 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git stripspace</em> [-s | --strip-comments] < <stream></p></div> +<div class="paragraph"><p><em>git stripspace</em> [-s | --strip-comments] < <stream></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Remove multiple empty lines, and empty lines at beginning and end.</p></div> +<div class="paragraph"><p>Remove multiple empty lines, and empty lines at beginning and end.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -s </dt> -<dt> +<dt class="hdlist1"> --strip-comments </dt> <dd> @@ -340,7 +434,7 @@ In addition to empty lines, also strip lines starting with <em>#</em>. </p> </dd> -<dt> +<dt class="hdlist1"> <stream> </dt> <dd> @@ -352,19 +446,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:59 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-submodule.html b/git-submodule.html index 168402a..714027c 100644 --- a/git-submodule.html +++ b/git-submodule.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-submodule(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-submodule(1)</title> </head> <body> <div id="header"> @@ -318,10 +412,10 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git submodule</em> [--quiet] add [-b branch] [-f|--force] +<div class="verseblock-content"><em>git submodule</em> [--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>] <em>git submodule</em> [--quiet] status [--cached] [--recursive] [--] [<path>…] <em>git submodule</em> [--quiet] init [--] [<path>…] @@ -329,14 +423,16 @@ [--reference <repository>] [--merge] [--recursive] [--] [<path>…] <em>git submodule</em> [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>…] <em>git submodule</em> [--quiet] foreach [--recursive] <command> -<em>git submodule</em> [--quiet] sync [--] [<path>…]</div></div> +<em>git submodule</em> [--quiet] sync [--] [<path>…]</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Submodules allow foreign repositories to be embedded within +<div class="paragraph"><p>Submodules allow foreign repositories to be embedded within a dedicated subdirectory of the source tree, always pointed at a particular commit.</p></div> -<div class="para"><p>They are not to be confused with remotes, which are meant mainly +<div class="paragraph"><p>They are not to be confused with remotes, which are meant mainly for branches of the same project; submodules are meant for different projects you would like to make part of your source tree, while the history of the two projects still stays completely @@ -348,7 +444,7 @@ instead of treating the other project as a submodule. Directories that come from both projects can be cloned and checked out as a whole if you choose to go that route.</p></div> -<div class="para"><p>Submodules are composed from a so-called <tt>gitlink</tt> tree entry +<div class="paragraph"><p>Submodules are composed from a so-called <tt>gitlink</tt> tree entry in the main repository that refers to a particular commit object within the inner repository that is completely separate. A record in the <tt>.gitmodules</tt> file at the root of the source @@ -356,7 +452,7 @@ the default URL the submodule shall be cloned from. The logical name can be used for overriding this URL within your local repository configuration (see <em>submodule init</em>).</p></div> -<div class="para"><p>This command will manage the tree entries and contents of the +<div class="paragraph"><p>This command will manage the tree entries and contents of the gitmodules file for you, as well as inspect the status of your submodules and update them. When adding a new submodule to the tree, the <em>add</em> subcommand @@ -371,8 +467,8 @@ </div> <h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> add </dt> <dd> @@ -381,31 +477,31 @@ to the changeset to be committed next to the current project: the current project is termed the "superproject". </p> -<div class="para"><p>This requires at least one argument: <repository>. The optional +<div class="paragraph"><p>This requires at least one argument: <repository>. The optional argument <path> is the relative location for the cloned submodule to exist in the superproject. If <path> is not given, the "humanish" part of the source repository is used ("repo" for "/path/to/repo.git" and "foo" for "host.xz:foo/.git").</p></div> -<div class="para"><p><repository> is the URL of the new submodule's origin repository. +<div class="paragraph"><p><repository> is the URL of the new submodule’s origin repository. This may be either an absolute URL, or (if it begins with ./ -or ../), the location relative to the superproject's origin +or ../), the location relative to the superproject’s origin repository.</p></div> -<div class="para"><p><path> is the relative location for the cloned submodule to +<div class="paragraph"><p><path> is the relative location for the cloned submodule to exist in the superproject. If <path> does not exist, then the submodule is created by cloning from the named URL. If <path> does exist and is already a valid git repository, then this is added to the changeset without cloning. This second form is provided to ease creating a new submodule from scratch, and presumes the user will later push the submodule to the given URL.</p></div> -<div class="para"><p>In either case, the given URL is recorded into .gitmodules for +<div class="paragraph"><p>In either case, the given URL is recorded into .gitmodules for use by subsequent users cloning the superproject. If the URL is -given relative to the superproject's repository, the presumption +given relative to the superproject’s repository, the presumption is the superproject and submodule repositories will be kept together in the same relative location, and only the -superproject's URL needs to be provided: git-submodule will correctly +superproject’s URL needs to be provided: git-submodule will correctly locate the submodule using the relative URL in .gitmodules.</p></div> </dd> -<dt> +<dt class="hdlist1"> status </dt> <dd> @@ -418,10 +514,10 @@ does not match the SHA-1 found in the index of the containing repository. This command is the default command for <em>git submodule</em>. </p> -<div class="para"><p>If <em>--recursive</em> is specified, this command will recurse into nested +<div class="paragraph"><p>If <em>--recursive</em> is specified, this command will recurse into nested submodules, and show their status as well.</p></div> </dd> -<dt> +<dt class="hdlist1"> init </dt> <dd> @@ -437,7 +533,7 @@ any submodule locations. </p> </dd> -<dt> +<dt class="hdlist1"> update </dt> <dd> @@ -448,13 +544,13 @@ <em>--merge</em> is specified or the key <tt>submodule.$name.update</tt> is set to <tt>rebase</tt> or <tt>merge</tt>. </p> -<div class="para"><p>If the submodule is not yet initialized, and you just want to use the +<div class="paragraph"><p>If the submodule is not yet initialized, and you just want to use the setting as stored in .gitmodules, you can automatically initialize the submodule with the --init option.</p></div> -<div class="para"><p>If <em>--recursive</em> is specified, this command will recurse into the +<div class="paragraph"><p>If <em>--recursive</em> is specified, this command will recurse into the registered submodules, and update any nested submodules within.</p></div> </dd> -<dt> +<dt class="hdlist1"> summary </dt> <dd> @@ -465,11 +561,11 @@ index or working tree (switched by --cached) are shown. If the option --files is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule - (this option doesn't allow to use the --cached option or to provide an + (this option doesn’t allow to use the --cached option or to provide an explicit commit). </p> </dd> -<dt> +<dt class="hdlist1"> foreach </dt> <dd> @@ -490,11 +586,11 @@ the processing to terminate. This can be overridden by adding <em>|| :</em> to the end of the command. </p> -<div class="para"><p>As an example, +git submodule foreach 'echo $path `git -rev-parse HEAD`'+ will show the path and currently checked out +<div class="paragraph"><p>As an example, <tt>git submodule foreach 'echo $path `git +rev-parse HEAD`'</tt> will show the path and currently checked out commit for each submodule.</p></div> </dd> -<dt> +<dt class="hdlist1"> sync </dt> <dd> @@ -504,18 +600,18 @@ submodule URLs change upstream and you need to update your local repositories accordingly. </p> -<div class="para"><p>"git submodule sync" synchronizes all submodules while -"git submodule sync — A" synchronizes submodule "A" only.</p></div> +<div class="paragraph"><p>"git submodule sync" synchronizes all submodules while +"git submodule sync — A" synchronizes submodule "A" only.</p></div> </dd> </dl></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -523,10 +619,10 @@ Only print error messages. </p> </dd> -<dt> +<dt class="hdlist1"> -b </dt> -<dt> +<dt class="hdlist1"> --branch </dt> <dd> @@ -534,10 +630,10 @@ Branch of repository to add as submodule. </p> </dd> -<dt> +<dt class="hdlist1"> -f </dt> -<dt> +<dt class="hdlist1"> --force </dt> <dd> @@ -546,7 +642,7 @@ Allow adding an otherwise ignored submodule path. </p> </dd> -<dt> +<dt class="hdlist1"> --cached </dt> <dd> @@ -556,7 +652,7 @@ with this option, the commit stored in the index is used instead. </p> </dd> -<dt> +<dt class="hdlist1"> --files </dt> <dd> @@ -566,10 +662,10 @@ when this option is used. </p> </dd> -<dt> +<dt class="hdlist1"> -n </dt> -<dt> +<dt class="hdlist1"> --summary-limit </dt> <dd> @@ -581,26 +677,26 @@ size is always limited to 1 for added/deleted/typechanged submodules. </p> </dd> -<dt> +<dt class="hdlist1"> -N </dt> -<dt> +<dt class="hdlist1"> --no-fetch </dt> <dd> <p> This option is only valid for the update command. - Don't fetch new objects from the remote site. + Don’t fetch new objects from the remote site. </p> </dd> -<dt> +<dt class="hdlist1"> --merge </dt> <dd> <p> This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch - of the submodule. If this option is given, the submodule's HEAD will + of the submodule. If this option is given, the submodule’s HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. @@ -608,21 +704,21 @@ implicit. </p> </dd> -<dt> +<dt class="hdlist1"> --rebase </dt> <dd> <p> This option is only valid for the update command. Rebase the current branch onto the commit recorded in the - superproject. If this option is given, the submodule's HEAD will not + superproject. If this option is given, the submodule’s HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with <a href="git-rebase.html">git-rebase(1)</a>. If the key <tt>submodule.$name.update</tt> is set to <tt>rebase</tt>, this option is implicit. </p> </dd> -<dt> +<dt class="hdlist1"> --reference <repository> </dt> <dd> @@ -631,10 +727,10 @@ commands sometimes need to clone a remote repository. In this case, this option will be passed to the <a href="git-clone.html">git-clone(1)</a> command. </p> -<div class="para"><p><strong>NOTE</strong>: Do <strong>not</strong> use this option unless you have read the note +<div class="paragraph"><p><strong>NOTE</strong>: Do <strong>not</strong> use this option unless you have read the note for <a href="git-clone.html">git-clone(1)</a>'s --reference and --shared options carefully.</p></div> </dd> -<dt> +<dt class="hdlist1"> --recursive </dt> <dd> @@ -645,7 +741,7 @@ in any nested submodules inside those submodules (and so on). </p> </dd> -<dt> +<dt class="hdlist1"> <path>… </dt> <dd> @@ -659,7 +755,7 @@ </div> <h2 id="_files">FILES</h2> <div class="sectionbody"> -<div class="para"><p>When initializing submodules, a .gitmodules file in the top-level directory +<div class="paragraph"><p>When initializing submodules, a .gitmodules file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as <tt>$GIT_DIR/config</tt>. The key to each submodule url is "submodule.$name.url". See <a href="gitmodules.html">gitmodules(5)</a> @@ -667,15 +763,15 @@ </div> <h2 id="_author">AUTHOR</h2> <div class="sectionbody"> -<div class="para"><p>Written by Lars Hjemli <hjemli@gmail.com></p></div> +<div class="paragraph"><p>Written by Lars Hjemli <<a href="mailto:hjemli@gmail.com">hjemli@gmail.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:59 UTC +Last updated 2010-07-19 20:25:56 UTC </div> </div> </body> diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 7da91ba..43f6312 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-symbolic-ref(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-symbolic-ref(1)</title> </head> <body> <div id="header"> @@ -318,29 +412,29 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git symbolic-ref</em> [-q] [-m <reason>] <name> [<ref>]</p></div> +<div class="paragraph"><p><em>git symbolic-ref</em> [-q] [-m <reason>] <name> [<ref>]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Given one argument, reads which branch head the given symbolic +<div class="paragraph"><p>Given one argument, reads which branch head the given symbolic ref refers to and outputs its path, relative to the <tt>.git/</tt> directory. Typically you would give <tt>HEAD</tt> as the <name> argument to see which branch your working tree is on.</p></div> -<div class="para"><p>Given two arguments, creates or updates a symbolic ref <name> to +<div class="paragraph"><p>Given two arguments, creates or updates a symbolic ref <name> to point at the given branch <ref>.</p></div> -<div class="para"><p>A symbolic ref is a regular file that stores a string that +<div class="paragraph"><p>A symbolic ref is a regular file that stores a string that begins with <tt>ref: refs/</tt>. For example, your <tt>.git/HEAD</tt> is a regular file whose contents is <tt>ref: refs/heads/master</tt>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -350,7 +444,7 @@ non-zero status silently. </p> </dd> -<dt> +<dt class="hdlist1"> -m </dt> <dd> @@ -363,7 +457,7 @@ </div> <h2 id="_notes">NOTES</h2> <div class="sectionbody"> -<div class="para"><p>In the past, <tt>.git/HEAD</tt> was a symbolic link pointing at +<div class="paragraph"><p>In the past, <tt>.git/HEAD</tt> was a symbolic link pointing at <tt>refs/heads/master</tt>. When we wanted to switch to another branch, we did <tt>ln -sf refs/heads/newbranch .git/HEAD</tt>, and when we wanted to find out which branch we are on, we did <tt>readlink .git/HEAD</tt>. @@ -373,21 +467,21 @@ cumbersome. On some platforms, <tt>ln -sf</tt> does not even work as advertised (horrors). Therefore symbolic links are now deprecated and symbolic refs are used by default.</p></div> -<div class="para"><p><em>git symbolic-ref</em> will exit with status 0 if the contents of the +<div class="paragraph"><p><em>git symbolic-ref</em> will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested name is not a symbolic ref, or 128 if another error occurs.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:59 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-tar-tree.html b/git-tar-tree.html index ac9df0b..fc411bc 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-tar-tree(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-tar-tree(1)</title> </head> <body> <div id="header"> @@ -318,18 +412,18 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git tar-tree</em> [--remote=<repo>] <tree-ish> [ <base> ]</p></div> +<div class="paragraph"><p><em>git tar-tree</em> [--remote=<repo>] <tree-ish> [ <base> ]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>THIS COMMAND IS DEPRECATED. Use <em>git archive</em> with <tt>--format=tar</tt> +<div class="paragraph"><p>THIS COMMAND IS DEPRECATED. Use <em>git archive</em> with <tt>--format=tar</tt> option instead (and move the <base> argument to <tt>--prefix=base/</tt>).</p></div> -<div class="para"><p>Creates a tar archive containing the tree structure for the named tree. +<div class="paragraph"><p>Creates a tar archive containing the tree structure for the named tree. When <base> is specified it is added as a leading path to the files in the generated tar archive.</p></div> -<div class="para"><p><em>git tar-tree</em> behaves differently when given a tree ID versus when given +<div class="paragraph"><p><em>git tar-tree</em> behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. @@ -338,8 +432,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tree-ish> </dt> <dd> @@ -348,7 +442,7 @@ the object name of a commit object. </p> </dd> -<dt> +<dt class="hdlist1"> <base> </dt> <dd> @@ -356,7 +450,7 @@ Leading path to the files in the resulting tar archive. </p> </dd> -<dt> +<dt class="hdlist1"> --remote=<repo> </dt> <dd> @@ -369,8 +463,8 @@ </div> <h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> tar.umask </dt> <dd> @@ -378,7 +472,7 @@ This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value "user" indicates that the - archiving user's umask will be used instead. See umask(2) for + archiving user’s umask will be used instead. See umask(2) for details. </p> </dd> @@ -386,8 +480,8 @@ </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> git tar-tree HEAD junk | (cd /var/tmp/ && tar xf -) </dt> <dd> @@ -397,7 +491,7 @@ <tt>/var/tmp/junk</tt> directory. </p> </dd> -<dt> +<dt class="hdlist1"> git tar-tree v1.4.0 git-1.4.0 | gzip >git-1.4.0.tar.gz </dt> <dd> @@ -405,7 +499,7 @@ Create a tarball for v1.4.0 release. </p> </dd> -<dt> +<dt class="hdlist1"> git tar-tree v1.4.0^{tree} git-1.4.0 | gzip >git-1.4.0.tar.gz </dt> <dd> @@ -414,7 +508,7 @@ global extended pax header. </p> </dd> -<dt> +<dt class="hdlist1"> git tar-tree --remote=example.com:git.git v1.4.0 >git-1.4.0.tar </dt> <dd> @@ -422,12 +516,12 @@ Get a tarball v1.4.0 from example.com. </p> </dd> -<dt> +<dt class="hdlist1"> git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar </dt> <dd> <p> - Put everything in the current head's Documentation/ directory + Put everything in the current head’s Documentation/ directory into <em>git-1.4.0-docs.tar</em>, with the prefix <em>git-docs/</em>. </p> </dd> @@ -435,19 +529,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Rene Scharfe.</p></div> +<div class="paragraph"><p>Written by Rene Scharfe.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:00 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-tools.html b/git-tools.html index 6ccc0dd..24edbb3 100644 --- a/git-tools.html +++ b/git-tools.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>A short git tools survey</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>A short git tools survey</title> </head> <body> <div id="header"> @@ -311,17 +388,17 @@ </div> <h2 id="_introduction">Introduction</h2> <div class="sectionbody"> -<div class="para"><p>Apart from git contrib/ area there are some others third-party tools +<div class="paragraph"><p>Apart from git contrib/ area there are some others third-party tools you may want to look.</p></div> -<div class="para"><p>This document presents a brief summary of each tool and the corresponding +<div class="paragraph"><p>This document presents a brief summary of each tool and the corresponding link.</p></div> </div> <h2 id="_alternative_augmentative_porcelains">Alternative/Augmentative Porcelains</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<strong>Cogito</strong> (http://www.kernel.org/pub/software/scm/cogito/) +<strong>Cogito</strong> (<a href="http://www.kernel.org/pub/software/scm/cogito/">http://www.kernel.org/pub/software/scm/cogito/</a>) </p> <div class="literalblock"> <div class="content"> @@ -338,7 +415,7 @@ </li> <li> <p> -<strong>pg</strong> (http://www.spearce.org/category/projects/scm/pg/) +<strong>pg</strong> (<a href="http://www.spearce.org/category/projects/scm/pg/">http://www.spearce.org/category/projects/scm/pg/</a>) </p> <div class="literalblock"> <div class="content"> @@ -349,7 +426,7 @@ </li> <li> <p> -<strong>StGit</strong> (http://www.procode.org/stgit/) +<strong>StGit</strong> (<a href="http://www.procode.org/stgit/">http://www.procode.org/stgit/</a>) </p> <div class="literalblock"> <div class="content"> @@ -362,7 +439,7 @@ </div> <h2 id="_history_viewers">History Viewers</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <strong>gitk</strong> (shipped with git-core) @@ -392,7 +469,7 @@ </li> <li> <p> -<strong>qgit</strong> (http://digilander.libero.it/mcostalba/) +<strong>qgit</strong> (<a href="http://digilander.libero.it/mcostalba/">http://digilander.libero.it/mcostalba/</a>) </p> <div class="literalblock"> <div class="content"> @@ -405,7 +482,7 @@ </li> <li> <p> -<strong>tig</strong> (http://jonas.nitro.dk/tig/) +<strong>tig</strong> (<a href="http://jonas.nitro.dk/tig/">http://jonas.nitro.dk/tig/</a>) </p> <div class="literalblock"> <div class="content"> @@ -419,7 +496,7 @@ </div> <h2 id="_foreign_scm_interface">Foreign SCM interface</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <strong>git-svn</strong> (shipped with git-core) @@ -432,7 +509,7 @@ </li> <li> <p> -<strong>quilt2git / git2quilt</strong> (http://home-tj.org/wiki/index.php/Misc) +<strong>quilt2git / git2quilt</strong> (<a href="http://home-tj.org/wiki/index.php/Misc">http://home-tj.org/wiki/index.php/Misc</a>) </p> <div class="literalblock"> <div class="content"> @@ -456,10 +533,10 @@ </div> <h2 id="_others">Others</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<strong>(h)gct</strong> (http://www.cyd.liu.se/users/~freku045/gct/) +<strong>(h)gct</strong> (<a href="http://www.cyd.liu.se/users/~freku045/gct/">http://www.cyd.liu.se/users/~freku045/gct/</a>) </p> <div class="literalblock"> <div class="content"> @@ -481,12 +558,12 @@ </div></div> </li> </ul></div> -<div class="para"><p>http://git.or.cz/gitwiki/InterfacesFrontendsAndTools has more +<div class="paragraph"><p><a href="http://git.or.cz/gitwiki/InterfacesFrontendsAndTools">http://git.or.cz/gitwiki/InterfacesFrontendsAndTools</a> has more comprehensive list.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:07 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-unpack-file.html b/git-unpack-file.html index 87c8697..47c53fd 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-unpack-file(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-unpack-file(1)</title> </head> <body> <div id="header"> @@ -318,20 +412,20 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git unpack-file</em> <blob></p></div> +<div class="paragraph"><p><em>git unpack-file</em> <blob></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Creates a file holding the contents of the blob specified by sha1. It +<div class="paragraph"><p>Creates a file holding the contents of the blob specified by sha1. It returns the name of the temporary file in the following format: .merge_file_XXXXX</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <blob> </dt> <dd> @@ -343,19 +437,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:00 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-unpack-objects.html b/git-unpack-objects.html index f72bcc2..05027f1 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-unpack-objects(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-unpack-objects(1)</title> </head> <body> <div id="header"> @@ -318,25 +412,25 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git unpack-objects</em> [-n] [-q] [-r] [--strict] <pack-file</p></div> +<div class="paragraph"><p><em>git unpack-objects</em> [-n] [-q] [-r] [--strict] <pack-file</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Read a packed archive (.pack) from the standard input, expanding +<div class="paragraph"><p>Read a packed archive (.pack) from the standard input, expanding the objects contained within and writing them into the repository in "loose" (one object per file) format.</p></div> -<div class="para"><p>Objects that already exist in the repository will <strong>not</strong> be unpacked +<div class="paragraph"><p>Objects that already exist in the repository will <strong>not</strong> be unpacked from the pack-file. Therefore, nothing will be unpacked if you use this command on a pack-file that exists within the target repository.</p></div> -<div class="para"><p>See <a href="git-repack.html">git-repack(1)</a> for options to generate +<div class="paragraph"><p>See <a href="git-repack.html">git-repack(1)</a> for options to generate new packs and replace existing ones.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -n </dt> <dd> @@ -345,7 +439,7 @@ the objects. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> <dd> @@ -354,7 +448,7 @@ flag suppresses it. </p> </dd> -<dt> +<dt class="hdlist1"> -r </dt> <dd> @@ -365,31 +459,31 @@ possible. </p> </dd> -<dt> +<dt class="hdlist1"> --strict </dt> <dd> <p> - Don't write objects with broken content or links. + Don’t write objects with broken content or links. </p> </dd> </dl></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:00 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-update-ref.html b/git-update-ref.html index 33c5fb9..ba037cf 100644 --- a/git-update-ref.html +++ b/git-update-ref.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-update-ref(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-update-ref(1)</title> </head> <body> <div id="header"> @@ -318,16 +412,16 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git update-ref</em> [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] <ref> <newvalue> [<oldvalue>])</p></div> +<div class="paragraph"><p><em>git update-ref</em> [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] <ref> <newvalue> [<oldvalue>])</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Given two arguments, stores the <newvalue> in the <ref>, possibly +<div class="paragraph"><p>Given two arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs. E.g. <tt>git update-ref HEAD <newvalue></tt> updates the current branch head to the new object.</p></div> -<div class="para"><p>Given three arguments, stores the <newvalue> in the <ref>, +<div class="paragraph"><p>Given three arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs, after verifying that the current value of the <ref> matches <oldvalue>. E.g. <tt>git update-ref refs/heads/master <newvalue> <oldvalue></tt> @@ -335,80 +429,80 @@ value is <oldvalue>. You can specify 40 "0" or an empty string as <oldvalue> to make sure that the ref you are creating does not exist.</p></div> -<div class="para"><p>It also allows a "ref" file to be a symbolic pointer to another +<div class="paragraph"><p>It also allows a "ref" file to be a symbolic pointer to another ref file by starting with the four-byte header sequence of "ref:".</p></div> -<div class="para"><p>More importantly, it allows the update of a ref file to follow +<div class="paragraph"><p>More importantly, it allows the update of a ref file to follow these symbolic pointers, whether they are symlinks or these "regular file symbolic refs". It follows <strong>real</strong> symlinks only if they start with "refs/": otherwise it will just try to read them and update them as a regular file (i.e. it will allow the filesystem to follow them, but will overwrite such a symlink to somewhere else with a regular filename).</p></div> -<div class="para"><p>If --no-deref is given, <ref> itself is overwritten, rather than +<div class="paragraph"><p>If --no-deref is given, <ref> itself is overwritten, rather than the result of following the symbolic pointers.</p></div> -<div class="para"><p>In general, using</p></div> +<div class="paragraph"><p>In general, using</p></div> <div class="literalblock"> <div class="content"> <pre><tt>git update-ref HEAD "$head"</tt></pre> </div></div> -<div class="para"><p>should be a _lot_ safer than doing</p></div> +<div class="paragraph"><p>should be a <em>lot</em> safer than doing</p></div> <div class="literalblock"> <div class="content"> <pre><tt>echo "$head" > "$GIT_DIR/HEAD"</tt></pre> </div></div> -<div class="para"><p>both from a symlink following standpoint <strong>and</strong> an error checking +<div class="paragraph"><p>both from a symlink following standpoint <strong>and</strong> an error checking standpoint. The "refs/" rule for symlinks means that symlinks -that point to "outside" the tree are safe: they'll be followed -for reading but not for writing (so we'll never write through a +that point to "outside" the tree are safe: they’ll be followed +for reading but not for writing (so we’ll never write through a ref symlink to some other tree, if you have copied a whole archive by creating a symlink tree).</p></div> -<div class="para"><p>With <tt>-d</tt> flag, it deletes the named <ref> after verifying it +<div class="paragraph"><p>With <tt>-d</tt> flag, it deletes the named <ref> after verifying it still contains <oldvalue>.</p></div> </div> <h2 id="_logging_updates">Logging Updates</h2> <div class="sectionbody"> -<div class="para"><p>If config parameter "core.logAllRefUpdates" is true or the file +<div class="paragraph"><p>If config parameter "core.logAllRefUpdates" is true or the file "$GIT_DIR/logs/<ref>" exists then <tt>git update-ref</tt> will append a line to the log file "$GIT_DIR/logs/<ref>" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> oldsha1 SP newsha1 SP committer LF </p> -<div class="para"><p>Where "oldsha1" is the 40 character hexadecimal value previously +<div class="paragraph"><p>Where "oldsha1" is the 40 character hexadecimal value previously stored in <ref>, "newsha1" is the 40 character hexadecimal value of -<newvalue> and "committer" is the committer's name, email address +<newvalue> and "committer" is the committer’s name, email address and date in the standard GIT committer ident format.</p></div> </li> </ol></div> -<div class="para"><p>Optionally with -m:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>Optionally with -m:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> oldsha1 SP newsha1 SP committer TAB message LF </p> -<div class="para"><p>Where all fields are as described above and "message" is the +<div class="paragraph"><p>Where all fields are as described above and "message" is the value supplied to the -m option.</p></div> </li> </ol></div> -<div class="para"><p>An update will fail (without changing <ref>) if the current user is +<div class="paragraph"><p>An update will fail (without changing <ref>) if the current user is unable to create a new log file, append to the existing log file or does not have committer information available.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>.</p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:01 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/git-update-server-info.html b/git-update-server-info.html index 2fdafd8..4044d81 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-update-server-info(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-update-server-info(1)</title> </head> <body> <div id="header"> @@ -318,13 +412,13 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git update-server-info</em> [--force]</p></div> +<div class="paragraph"><p><em>git update-server-info</em> [--force]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>A dumb server that does not do on-the-fly pack generations must +<div class="paragraph"><p>A dumb server that does not do on-the-fly pack generations must have some auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info directories to help clients discover what references and packs the server has. This command @@ -332,11 +426,11 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -f </dt> -<dt> +<dt class="hdlist1"> --force </dt> <dd> @@ -348,10 +442,10 @@ </div> <h2 id="_output">OUTPUT</h2> <div class="sectionbody"> -<div class="para"><p>Currently the command updates the following files. Please see +<div class="paragraph"><p>Currently the command updates the following files. Please see <a href="gitrepository-layout.html">gitrepository-layout(5)</a> for description of what they are for:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> objects/info/packs @@ -366,19 +460,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:01 UTC +Last updated 2009-04-26 01:41:22 UTC </div> </div> </body> diff --git a/git-upload-archive.html b/git-upload-archive.html index dff28f8..fe60aef 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-upload-archive(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-upload-archive(1)</title> </head> <body> <div id="header"> @@ -318,22 +412,22 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git upload-archive</em> <directory></p></div> +<div class="paragraph"><p><em>git upload-archive</em> <directory></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Invoked by <em>git archive --remote</em> and sends a generated archive to the +<div class="paragraph"><p>Invoked by <em>git archive --remote</em> and sends a generated archive to the other end over the git protocol.</p></div> -<div class="para"><p>This command is usually not invoked directly by the end user. The UI +<div class="paragraph"><p>This command is usually not invoked directly by the end user. The UI for the protocol is on the <em>git archive</em> side, and the program pair is meant to be used to get an archive from a remote repository.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <directory> </dt> <dd> @@ -345,19 +439,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Franck Bui-Huu.</p></div> +<div class="paragraph"><p>Written by Franck Bui-Huu.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:01 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-upload-pack.html b/git-upload-pack.html index 2e0bbdc..e1c4ae5 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-upload-pack(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-upload-pack(1)</title> </head> <body> <div id="header"> @@ -318,23 +412,23 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git-upload-pack</em> [--strict] [--timeout=<n>] <directory></p></div> +<div class="paragraph"><p><em>git-upload-pack</em> [--strict] [--timeout=<n>] <directory></p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Invoked by <em>git fetch-pack</em>, learns what +<div class="paragraph"><p>Invoked by <em>git fetch-pack</em>, learns what objects the other side is missing, and sends them after packing.</p></div> -<div class="para"><p>This command is usually not invoked directly by the end user. +<div class="paragraph"><p>This command is usually not invoked directly by the end user. The UI for the protocol is on the <em>git fetch-pack</em> side, and the program pair is meant to be used to pull updates from a remote repository. For push operations, see <em>git send-pack</em>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --strict </dt> <dd> @@ -342,7 +436,7 @@ Do not try <directory>/.git/ if <directory> is no git directory. </p> </dd> -<dt> +<dt class="hdlist1"> --timeout=<n> </dt> <dd> @@ -350,7 +444,7 @@ Interrupt transfer after <n> seconds of inactivity. </p> </dd> -<dt> +<dt class="hdlist1"> <directory> </dt> <dd> @@ -362,19 +456,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano.</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:01 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-var.html b/git-var.html index 989302b..b6f62b9 100644 --- a/git-var.html +++ b/git-var.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-var(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-var(1)</title> </head> <body> <div id="header"> @@ -318,18 +412,18 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git var</em> ( -l | <variable> )</p></div> +<div class="paragraph"><p><em>git var</em> ( -l | <variable> )</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Prints a git logical variable.</p></div> +<div class="paragraph"><p>Prints a git logical variable.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -l </dt> <dd> @@ -352,8 +446,8 @@ </div> <h2 id="_variables">VARIABLES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> GIT_AUTHOR_IDENT </dt> <dd> @@ -361,7 +455,7 @@ The author of a piece of code. </p> </dd> -<dt> +<dt class="hdlist1"> GIT_COMMITTER_IDENT </dt> <dd> @@ -369,7 +463,7 @@ The person who put a piece of code into git. </p> </dd> -<dt> +<dt class="hdlist1"> GIT_EDITOR </dt> <dd> @@ -382,7 +476,7 @@ <tt>$VISUAL</tt>, then <tt>$EDITOR</tt>, and then finally <em>vi</em>. </p> </dd> -<dt> +<dt class="hdlist1"> GIT_PAGER </dt> <dd> @@ -397,16 +491,16 @@ </div> <h2 id="_diagnostics">Diagnostics</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> -You don't exist. Go away! +<div class="dlist"><dl> +<dt class="hdlist1"> +You don’t exist. Go away! </dt> <dd> <p> - The passwd(5) gecos field couldn't be read + The passwd(5) gecos field couldn’t be read </p> </dd> -<dt> +<dt class="hdlist1"> Your parents must have hated you! </dt> <dd> @@ -414,7 +508,7 @@ The passwd(5) gecos field is longer than a giant static buffer. </p> </dd> -<dt> +<dt class="hdlist1"> Your sysadmin must hate you! </dt> <dd> @@ -426,25 +520,25 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-commit-tree.html">git-commit-tree(1)</a> +<div class="paragraph"><p><a href="git-commit-tree.html">git-commit-tree(1)</a> <a href="git-tag.html">git-tag(1)</a> <a href="git-config.html">git-config(1)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Eric Biederman <ebiederm@xmission.com></p></div> +<div class="paragraph"><p>Written by Eric Biederman <<a href="mailto:ebiederm@xmission.com">ebiederm@xmission.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Eric Biederman and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:01 UTC +Last updated 2010-03-03 05:12:36 UTC </div> </div> </body> diff --git a/git-verify-pack.html b/git-verify-pack.html index 1aab585..3dc00f1 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-verify-pack(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-verify-pack(1)</title> </head> <body> <div id="header"> @@ -318,20 +412,20 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git verify-pack</em> [-v|--verbose] [--] <pack>.idx …</p></div> +<div class="paragraph"><p><em>git verify-pack</em> [-v|--verbose] [--] <pack>.idx …</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Reads given idx file for packed git archive created with the +<div class="paragraph"><p>Reads given idx file for packed git archive created with the <em>git pack-objects</em> command and verifies idx file and the corresponding pack file.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <pack>.idx … </dt> <dd> @@ -339,10 +433,10 @@ The idx files to verify. </p> </dd> -<dt> +<dt class="hdlist1"> -v </dt> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -351,10 +445,10 @@ in the pack and a histogram of delta chain length. </p> </dd> -<dt> +<dt class="hdlist1"> -s </dt> -<dt> +<dt class="hdlist1"> --stat-only </dt> <dd> @@ -363,7 +457,7 @@ chain length. With <tt>--verbose</tt>, list of objects is also shown. </p> </dd> -<dt> +<dt class="hdlist1"> -- </dt> <dd> @@ -375,33 +469,33 @@ </div> <h2 id="_output_format">OUTPUT FORMAT</h2> <div class="sectionbody"> -<div class="para"><p>When specifying the -v option the format used is:</p></div> +<div class="paragraph"><p>When specifying the -v option the format used is:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>SHA1 type size size-in-pack-file offset-in-packfile</tt></pre> </div></div> -<div class="para"><p>for objects that are not deltified in the pack, and</p></div> +<div class="paragraph"><p>for objects that are not deltified in the pack, and</p></div> <div class="literalblock"> <div class="content"> <pre><tt>SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1</tt></pre> </div></div> -<div class="para"><p>for objects that are deltified.</p></div> +<div class="paragraph"><p>for objects that are deltified.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Junio C Hamano</p></div> +<div class="paragraph"><p>Documentation by Junio C Hamano</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:02 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git-write-tree.html b/git-write-tree.html index 2535388..a93d88b 100644 --- a/git-write-tree.html +++ b/git-write-tree.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-write-tree(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-write-tree(1)</title> </head> <body> <div id="header"> @@ -318,16 +412,16 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git write-tree</em> [--missing-ok] [--prefix=<prefix>/]</p></div> +<div class="paragraph"><p><em>git write-tree</em> [--missing-ok] [--prefix=<prefix>/]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Creates a tree object using the current index. The name of the new +<div class="paragraph"><p>Creates a tree object using the current index. The name of the new tree object is printed to standard output.</p></div> -<div class="para"><p>The index must be in a fully merged state.</p></div> -<div class="para"><p>Conceptually, <em>git write-tree</em> sync()s the current index contents +<div class="paragraph"><p>The index must be in a fully merged state.</p></div> +<div class="paragraph"><p>Conceptually, <em>git write-tree</em> sync()s the current index contents into a set of tree files. In order to have that match what is actually in your directory right now, you need to have done a <em>git update-index</em> phase before you did the @@ -335,8 +429,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --missing-ok </dt> <dd> @@ -346,7 +440,7 @@ check. </p> </dd> -<dt> +<dt class="hdlist1"> --prefix=<prefix>/ </dt> <dd> @@ -360,19 +454,19 @@ </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:02 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/git.html b/git.html index ee57b5b..0b82bce 100644 --- a/git.html +++ b/git.html
@@ -2216,7 +2216,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-01-24 22:52:30 UTC +Last updated 2011-01-31 04:59:35 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index 0dac7aa..e968ed4 100644 --- a/git.txt +++ b/git.txt
@@ -44,6 +44,11 @@ branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.7.4/git.html[documentation for release 1.7.4] + +* release notes for + link:RelNotes/1.7.4.txt[1.7.4]. + * link:v1.7.3.5/git.html[documentation for release 1.7.3.5] * release notes for
diff --git a/gitcli.html b/gitcli.html index 577f250..d1173b1 100644 --- a/gitcli.html +++ b/gitcli.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>gitcli(7)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>gitcli(7)</title> </head> <body> <div id="header"> @@ -318,17 +412,17 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p>gitcli</p></div> +<div class="paragraph"><p>gitcli</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This manual describes the convention used throughout git CLI.</p></div> -<div class="para"><p>Many commands take revisions (most often "commits", but sometimes +<div class="paragraph"><p>This manual describes the convention used throughout git CLI.</p></div> +<div class="paragraph"><p>Many commands take revisions (most often "commits", but sometimes "tree-ish", depending on the context and command) and paths as their arguments. Here are the rules:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Revisions come first and then paths. @@ -358,15 +452,15 @@ </p> </li> </ul></div> -<div class="para"><p>When writing a script that is expected to handle random user-input, it is +<div class="paragraph"><p>When writing a script that is expected to handle random user-input, it is a good practice to make it explicit which arguments are which by placing disambiguating <tt>--</tt> at appropriate places.</p></div> -<div class="para"><p>Here are the rules regarding the "flags" that you should follow when you are +<div class="paragraph"><p>Here are the rules regarding the "flags" that you should follow when you are scripting git:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -it's preferred to use the non dashed form of git commands, which means that +it’s preferred to use the non dashed form of git commands, which means that you should prefer <tt>git foo</tt> to <tt>git-foo</tt>. </p> </li> @@ -397,14 +491,14 @@ </div> <h2 id="_enhanced_option_parser">ENHANCED OPTION PARSER</h2> <div class="sectionbody"> -<div class="para"><p>From the git 1.5.4 series and further, many git commands (not all of them at the +<div class="paragraph"><p>From the git 1.5.4 series and further, many git commands (not all of them at the time of the writing though) come with an enhanced option parser.</p></div> -<div class="para"><p>Here is an exhaustive list of the facilities provided by this option parser.</p></div> +<div class="paragraph"><p>Here is an exhaustive list of the facilities provided by this option parser.</p></div> <h3 id="_magic_options">Magic Options</h3><div style="clear:left"></div> -<div class="para"><p>Commands which have the enhanced option parser activated all understand a +<div class="paragraph"><p>Commands which have the enhanced option parser activated all understand a couple of magic command line options:</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -h </dt> <dd> @@ -424,7 +518,7 @@ --candidates <n> consider <n> most recent tags (default: 10)</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> --help-all </dt> <dd> @@ -436,16 +530,16 @@ </dd> </dl></div> <h3 id="_negating_options">Negating options</h3><div style="clear:left"></div> -<div class="para"><p>Options with long option names can be negated by prefixing <tt>--no-</tt>. For +<div class="paragraph"><p>Options with long option names can be negated by prefixing <tt>--no-</tt>. For example, <tt>git branch</tt> has the option <tt>--track</tt> which is <em>on</em> by default. You can use <tt>--no-track</tt> to override that behaviour. The same goes for <tt>--color</tt> and <tt>--no-color</tt>.</p></div> <h3 id="_aggregating_short_options">Aggregating short options</h3><div style="clear:left"></div> -<div class="para"><p>Commands that support the enhanced option parser allow you to aggregate short +<div class="paragraph"><p>Commands that support the enhanced option parser allow you to aggregate short options. This means that you can for example use <tt>git rm -rf</tt> or <tt>git clean -fdx</tt>.</p></div> <h3 id="_separating_argument_from_the_option">Separating argument from the option</h3><div style="clear:left"></div> -<div class="para"><p>You can write the mandatory option parameter to an option as a separate +<div class="paragraph"><p>You can write the mandatory option parameter to an option as a separate word on the command line. That means that all the following uses work:</p></div> <div class="listingblock"> <div class="content"> @@ -454,7 +548,7 @@ $ git foo -oArg $ git foo -o Arg</tt></pre> </div></div> -<div class="para"><p>However, this is <strong>NOT</strong> allowed for switches with an optional value, where the +<div class="paragraph"><p>However, this is <strong>NOT</strong> allowed for switches with an optional value, where the <em>sticked</em> form must be used:</p></div> <div class="listingblock"> <div class="content"> @@ -465,13 +559,13 @@ </div> <h2 id="_notes_on_frequently_confused_options">NOTES ON FREQUENTLY CONFUSED OPTIONS</h2> <div class="sectionbody"> -<div class="para"><p>Many commands that can work on files in the working tree +<div class="paragraph"><p>Many commands that can work on files in the working tree and/or in the index can take <tt>--cached</tt> and/or <tt>--index</tt> options. Sometimes people incorrectly think that, because the index was originally called cache, these two are -synonyms. They are <strong>not</strong> — these two options mean very +synonyms. They are <strong>not</strong> — these two options mean very different things.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> The <tt>--cached</tt> option is used to ask a command that @@ -494,27 +588,27 @@ </p> </li> </ul></div> -<div class="para"><p><tt>git apply</tt> command can be used with <tt>--cached</tt> and +<div class="paragraph"><p><tt>git apply</tt> command can be used with <tt>--cached</tt> and <tt>--index</tt> (but not at the same time). Usually the command only affects the files in the working tree, but with <tt>--index</tt>, it patches both the files and their index entries, and with <tt>--cached</tt>, it modifies only the index entries.</p></div> -<div class="para"><p>See also http://marc.info/?l=git&m=116563135620359 and -http://marc.info/?l=git&m=119150393620273 for further +<div class="paragraph"><p>See also <a href="http://marc.info/?l=git&m=116563135620359">http://marc.info/?l=git&m=116563135620359</a> and +<a href="http://marc.info/?l=git&m=119150393620273">http://marc.info/?l=git&m=119150393620273</a> for further information.</p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Pierre Habouzit and the git-list <git@vger.kernel.org>.</p></div> +<div class="paragraph"><p>Documentation by Pierre Habouzit and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:04 UTC +Last updated 2009-09-23 06:50:45 UTC </div> </div> </body> diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 15f6010..3778aac 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>gitcvs-migration(7)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>gitcvs-migration(7)</title> </head> <body> <div id="header"> @@ -318,24 +412,24 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p>git cvsimport *</p></div> +<div class="paragraph"><p>git cvsimport *</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Git differs from CVS in that every working tree contains a repository with +<div class="paragraph"><p>Git differs from CVS in that every working tree contains a repository with a full copy of the project history, and no repository is inherently more important than any other. However, you can emulate the CVS model by designating a single shared repository which people can synchronize with; this document explains how to do that.</p></div> -<div class="para"><p>Some basic familiarity with git is required. Having gone through +<div class="paragraph"><p>Some basic familiarity with git is required. Having gone through <a href="gittutorial.html">gittutorial(7)</a> and <a href="gitglossary.html">gitglossary(7)</a> should be sufficient.</p></div> </div> <h2 id="_developing_against_a_shared_repository">Developing against a shared repository</h2> <div class="sectionbody"> -<div class="para"><p>Suppose a shared repository is set up in /pub/repo.git on the host +<div class="paragraph"><p>Suppose a shared repository is set up in /pub/repo.git on the host foo.com. Then as an individual committer you can clone the shared repository over ssh with:</p></div> <div class="listingblock"> @@ -343,12 +437,12 @@ <pre><tt>$ git clone foo.com:/pub/repo.git/ my-project $ cd my-project</tt></pre> </div></div> -<div class="para"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div> +<div class="paragraph"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull origin</tt></pre> </div></div> -<div class="para"><p>which merges in any work that others might have done since the clone +<div class="paragraph"><p>which merges in any work that others might have done since the clone operation. If there are uncommitted changes in your working tree, commit them first before running git pull.</p></div> <div class="admonitionblock"> @@ -357,24 +451,24 @@ <div class="title">Note</div> </td> <td class="content"> -<div class="para"><p>The <em>pull</em> command knows where to get updates from because of certain +<div class="paragraph"><p>The <em>pull</em> command knows where to get updates from because of certain configuration variables that were set by the first <em>git clone</em> command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man page for details.</p></div> </td> </tr></table> </div> -<div class="para"><p>You can update the shared repository with your changes by first committing +<div class="paragraph"><p>You can update the shared repository with your changes by first committing your changes, and then using the <em>git push</em> command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git push origin master</tt></pre> </div></div> -<div class="para"><p>to "push" those commits to the shared repository. If someone else has +<div class="paragraph"><p>to "push" those commits to the shared repository. If someone else has updated the repository more recently, <em>git push</em>, like <em>cvs commit</em>, will complain, in which case you must pull any changes before attempting the push again.</p></div> -<div class="para"><p>In the <em>git push</em> command above we specify the name of the remote branch +<div class="paragraph"><p>In the <em>git push</em> command above we specify the name of the remote branch to update (<tt>master</tt>). If we leave that out, <em>git push</em> tries to update any branches in the remote repository that have the same name as a branch in the local repository. So the last <em>push</em> can be done with either of:</p></div> @@ -383,16 +477,16 @@ <pre><tt>$ git push origin $ git push foo.com:/pub/project.git/</tt></pre> </div></div> -<div class="para"><p>as long as the shared repository does not have any branches +<div class="paragraph"><p>as long as the shared repository does not have any branches other than <tt>master</tt>.</p></div> </div> <h2 id="_setting_up_a_shared_repository">Setting Up a Shared Repository</h2> <div class="sectionbody"> -<div class="para"><p>We assume you have already created a git repository for your project, +<div class="paragraph"><p>We assume you have already created a git repository for your project, possibly created from scratch or from a tarball (see <a href="gittutorial.html">gittutorial(7)</a>), or imported from an already existing CVS repository (see the next section).</p></div> -<div class="para"><p>Assume your existing repo is at /home/alice/myproject. Create a new "bare" +<div class="paragraph"><p>Assume your existing repo is at /home/alice/myproject. Create a new "bare" repository (a repository without a working tree) and fetch your project into it:</p></div> <div class="listingblock"> @@ -402,23 +496,23 @@ $ git --bare init --shared $ git --bare fetch /home/alice/myproject master:master</tt></pre> </div></div> -<div class="para"><p>Next, give every team member read/write access to this repository. One +<div class="paragraph"><p>Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the -machine where the repository is hosted. If you don't want to give them a +machine where the repository is hosted. If you don’t want to give them a full shell on the machine, there is a restricted shell which only allows users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p></div> -<div class="para"><p>Put all the committers in the same group, and make the repository +<div class="paragraph"><p>Put all the committers in the same group, and make the repository writable by that group:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre> </div></div> -<div class="para"><p>Make sure committers have a umask of at most 027, so that the directories +<div class="paragraph"><p>Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members.</p></div> </div> <h2 id="_importing_a_cvs_archive">Importing a CVS archive</h2> <div class="sectionbody"> -<div class="para"><p>First, install version 2.1 or higher of cvsps from +<div class="paragraph"><p>First, install version 2.1 or higher of cvsps from <a href="http://www.cobite.com/cvsps/">http://www.cobite.com/cvsps/</a> and make sure it is in your path. Then cd to a checked out CVS working directory of the project you are interested in and run <a href="git-cvsimport.html">git-cvsimport(1)</a>:</p></div> @@ -426,75 +520,75 @@ <div class="content"> <pre><tt>$ git cvsimport -C <destination> <module></tt></pre> </div></div> -<div class="para"><p>This puts a git archive of the named CVS module in the directory +<div class="paragraph"><p>This puts a git archive of the named CVS module in the directory <destination>, which will be created if necessary.</p></div> -<div class="para"><p>The import checks out from CVS every revision of every file. Reportedly +<div class="paragraph"><p>The import checks out from CVS every revision of every file. Reportedly cvsimport can average some twenty revisions per second, so for a medium-sized project this should not take more than a couple of minutes. Larger projects or remote repositories may take longer.</p></div> -<div class="para"><p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional +<div class="paragraph"><p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional CVS branches are stored in git branches with the same names. The most recent version of the main trunk is also left checked out on the <tt>master</tt> branch, so you can start adding your own changes right away.</p></div> -<div class="para"><p>The import is incremental, so if you call it again next month it will +<div class="paragraph"><p>The import is incremental, so if you call it again next month it will fetch any CVS updates that have been made in the meantime. For this to work, you must not modify the imported branches; instead, create new branches for your own changes, and merge in the imported branches as necessary.</p></div> -<div class="para"><p>If you want a shared repository, you will need to make a bare clone +<div class="paragraph"><p>If you want a shared repository, you will need to make a bare clone of the imported directory, as described above. Then treat the imported directory as another development clone for purposes of merging incremental imports.</p></div> </div> <h2 id="_advanced_shared_repository_management">Advanced Shared Repository Management</h2> <div class="sectionbody"> -<div class="para"><p>Git allows you to specify scripts called "hooks" to be run at certain +<div class="paragraph"><p>Git allows you to specify scripts called "hooks" to be run at certain points. You can use these, for example, to send all commits to the shared repository to a mailing list. See <a href="githooks.html">githooks(5)</a>.</p></div> -<div class="para"><p>You can enforce finer grained permissions using update hooks. See +<div class="paragraph"><p>You can enforce finer grained permissions using update hooks. See <a href="howto/update-hook-example.txt">Controlling access to branches using update hooks</a>.</p></div> </div> <h2 id="_providing_cvs_access_to_a_git_repository">Providing CVS Access to a git Repository</h2> <div class="sectionbody"> -<div class="para"><p>It is also possible to provide true CVS access to a git repository, so +<div class="paragraph"><p>It is also possible to provide true CVS access to a git repository, so that developers can still use CVS; see <a href="git-cvsserver.html">git-cvsserver(1)</a> for details.</p></div> </div> <h2 id="_alternative_development_models">Alternative Development Models</h2> <div class="sectionbody"> -<div class="para"><p>CVS users are accustomed to giving a group of developers commit access to -a common repository. As we've seen, this is also possible with git. +<div class="paragraph"><p>CVS users are accustomed to giving a group of developers commit access to +a common repository. As we’ve seen, this is also possible with git. However, the distributed nature of git allows other development models, and you may want to first consider whether one of them might be a better fit for your project.</p></div> -<div class="para"><p>For example, you can choose a single person to maintain the project's +<div class="paragraph"><p>For example, you can choose a single person to maintain the project’s primary public repository. Other developers then clone this repository and each work in their own clone. When they have a series of changes that -they're happy with, they ask the maintainer to pull from the branch +they’re happy with, they ask the maintainer to pull from the branch containing the changes. The maintainer reviews their changes and pulls them into the primary repository, which other developers pull from as necessary to stay coordinated. The Linux kernel and other projects use variants of this model.</p></div> -<div class="para"><p>With a small group, developers may just pull changes from each other's +<div class="paragraph"><p>With a small group, developers may just pull changes from each other’s repositories without the need for a central maintainer.</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, +<div class="paragraph"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>, <a href="gitglossary.html">gitglossary(7)</a>, <a href="everyday.html">Everyday Git</a>, -<a href="user-manual.html">The Git User's Manual</a></p></div> +<a href="user-manual.html">The Git User’s Manual</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:05 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/gitdiffcore.html b/gitdiffcore.html index 65b5823..054c982 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>gitdiffcore(7)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>gitdiffcore(7)</title> </head> <body> <div id="header"> @@ -318,13 +412,13 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git diff</em> *</p></div> +<div class="paragraph"><p><em>git diff</em> *</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>The diff commands <em>git diff-index</em>, <em>git diff-files</em>, and <em>git diff-tree</em> +<div class="paragraph"><p>The diff commands <em>git diff-index</em>, <em>git diff-files</em>, and <em>git diff-tree</em> can be told to manipulate differences they find in unconventional ways before showing <em>diff</em> output. The manipulation is collectively called "diffcore transformation". This short note @@ -333,9 +427,9 @@ </div> <h2 id="_the_chain_of_operation">The chain of operation</h2> <div class="sectionbody"> -<div class="para"><p>The <em>git diff-*</em> family works by first comparing two sets of +<div class="paragraph"><p>The <em>git diff-*</em> family works by first comparing two sets of files:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <em>git diff-index</em> compares contents of a "tree" object and the @@ -356,20 +450,20 @@ </p> </li> </ul></div> -<div class="para"><p>In all of these cases, the commands themselves first optionally limit +<div class="paragraph"><p>In all of these cases, the commands themselves first optionally limit the two sets of files by any pathspecs given on their command-lines, and compare corresponding paths in the two resulting sets of files.</p></div> -<div class="para"><p>The pathspecs are used to limit the world diff operates in. They remove +<div class="paragraph"><p>The pathspecs are used to limit the world diff operates in. They remove the filepairs outside the specified sets of pathnames. E.g. If the input set of filepairs included:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 bcd1234... 0123456... M junkfile</tt></pre> </div></div> -<div class="para"><p>but the command invocation was <tt>git diff-files myfile</tt>, then the +<div class="paragraph"><p>but the command invocation was <tt>git diff-files myfile</tt>, then the junkfile entry would be removed from the list because only "myfile" is under consideration.</p></div> -<div class="para"><p>The result of comparison is passed from these commands to what is +<div class="paragraph"><p>The result of comparison is passed from these commands to what is internally called "diffcore", in a format similar to what is output when the -p option is not used. E.g.</p></div> <div class="listingblock"> @@ -379,11 +473,11 @@ delete :100644 000000 1234567... 0000000... D file5 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre> </div></div> -<div class="para"><p>The diffcore mechanism is fed a list of such comparison results +<div class="paragraph"><p>The diffcore mechanism is fed a list of such comparison results (each of which is called "filepair", although at this point each of them talks about a single file), and transforms such a list into another list. There are currently 5 such transformations:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> diffcore-break @@ -410,7 +504,7 @@ </p> </li> </ul></div> -<div class="para"><p>These are applied in sequence. The set of filepairs <em>git diff-*</em> +<div class="paragraph"><p>These are applied in sequence. The set of filepairs <em>git diff-*</em> commands find are used as the input to diffcore-break, and the output from diffcore-break is used as the input to the next transformation. The final result is then passed to the @@ -420,7 +514,7 @@ </div> <h2 id="_diffcore_break_for_splitting_up_complete_rewrites">diffcore-break: For Splitting Up "Complete Rewrites"</h2> <div class="sectionbody"> -<div class="para"><p>The second transformation in the chain is diffcore-break, and is +<div class="paragraph"><p>The second transformation in the chain is diffcore-break, and is controlled by the -B option to the <em>git diff-*</em> commands. This is used to detect a filepair that represents "complete rewrite" and break such filepair into two filepairs that represent delete and @@ -429,14 +523,14 @@ <div class="content"> <pre><tt>:100644 100644 bcd1234... 0123456... M file0</tt></pre> </div></div> -<div class="para"><p>and if it detects that the file "file0" is completely rewritten, +<div class="paragraph"><p>and if it detects that the file "file0" is completely rewritten, it changes it to:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 000000 bcd1234... 0000000... D file0 :000000 100644 0000000... 0123456... A file0</tt></pre> </div></div> -<div class="para"><p>For the purpose of breaking a filepair, diffcore-break examines +<div class="paragraph"><p>For the purpose of breaking a filepair, diffcore-break examines the extent of changes between the contents of the files before and after modification (i.e. the contents that have "bcd1234…" and "0123456…" as their SHA1 content ID, in the above @@ -451,7 +545,7 @@ </div> <h2 id="_diffcore_rename_for_detection_renames_and_copies">diffcore-rename: For Detection Renames and Copies</h2> <div class="sectionbody"> -<div class="para"><p>This transformation is used to detect renames and copies, and is +<div class="paragraph"><p>This transformation is used to detect renames and copies, and is controlled by the -M option (to detect renames) and the -C option (to detect copies as well) to the <em>git diff-*</em> commands. If the input contained these filepairs:</p></div> @@ -460,14 +554,14 @@ <pre><tt>:100644 000000 0123456... 0000000... D fileX :000000 100644 0000000... 0123456... A file0</tt></pre> </div></div> -<div class="para"><p>and the contents of the deleted file fileX is similar enough to +<div class="paragraph"><p>and the contents of the deleted file fileX is similar enough to the contents of the created file file0, then rename detection merges these filepairs and creates:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>:100644 100644 0123456... 0123456... R100 fileX file0</tt></pre> </div></div> -<div class="para"><p>When the "-C" option is used, the original contents of modified files, +<div class="paragraph"><p>When the "-C" option is used, the original contents of modified files, and deleted files (and also unmodified files, if the "--find-copies-harder" option is used) are considered as candidates of the source files in rename/copy operation. If the input were like @@ -478,7 +572,7 @@ <pre><tt>:100644 100644 0123456... 1234567... M fileY :000000 100644 0000000... bcd3456... A file0</tt></pre> </div></div> -<div class="para"><p>the original contents of fileY and the resulting contents of +<div class="paragraph"><p>the original contents of fileY and the resulting contents of file0 are compared, and if they are similar enough, they are changed to:</p></div> <div class="listingblock"> @@ -486,13 +580,13 @@ <pre><tt>:100644 100644 0123456... 1234567... M fileY :100644 100644 0123456... bcd3456... C100 fileY file0</tt></pre> </div></div> -<div class="para"><p>In both rename and copy detection, the same "extent of changes" +<div class="paragraph"><p>In both rename and copy detection, the same "extent of changes" algorithm used in diffcore-break is used to determine if two files are "similar enough", and can be customized to use a similarity score different from the default of 50% by giving a number after the "-M" or "-C" option (e.g. "-M8" to tell it to use 8/10 = 80%).</p></div> -<div class="para"><p>Note. When the "-C" option is used with <tt>--find-copies-harder</tt> +<div class="paragraph"><p>Note. When the "-C" option is used with <tt>--find-copies-harder</tt> option, <em>git diff-*</em> commands feed unmodified filepairs to diffcore mechanism as well as modified ones. This lets the copy detector consider unmodified files as copy source candidates at @@ -502,11 +596,11 @@ </div> <h2 id="_diffcore_merge_broken_for_putting_complete_rewrites_back_together">diffcore-merge-broken: For Putting "Complete Rewrites" Back Together</h2> <div class="sectionbody"> -<div class="para"><p>This transformation is used to merge filepairs broken by +<div class="paragraph"><p>This transformation is used to merge filepairs broken by diffcore-break, and not transformed into rename/copy by diffcore-rename, back into a single modification. This always runs when diffcore-break is used.</p></div> -<div class="para"><p>For the purpose of merging broken filepairs back, it uses a +<div class="paragraph"><p>For the purpose of merging broken filepairs back, it uses a different "extent of changes" computation from the ones used by diffcore-break and diffcore-rename. It counts only the deletion from the original, and does not count insertion. If you removed @@ -518,12 +612,12 @@ matched with other filepairs to create rename/copy, then this transformation merges them back into the original "modification".</p></div> -<div class="para"><p>The "extent of changes" parameter can be tweaked from the +<div class="paragraph"><p>The "extent of changes" parameter can be tweaked from the default 80% (that is, unless more than 80% of the original material is deleted, the broken pairs are merged back into a single modification) by giving a second number to -B option, like these:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -B50/60 (give 50% "break score" to diffcore-break, use 60% @@ -536,7 +630,7 @@ </p> </li> </ul></div> -<div class="para"><p>Note that earlier implementation left a broken pair as a separate +<div class="paragraph"><p>Note that earlier implementation left a broken pair as a separate creation and deletion patches. This was an unnecessary hack and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is @@ -547,16 +641,16 @@ </div> <h2 id="_diffcore_pickaxe_for_detecting_addition_deletion_of_specified_string">diffcore-pickaxe: For Detecting Addition/Deletion of Specified String</h2> <div class="sectionbody"> -<div class="para"><p>This transformation is used to find filepairs that represent +<div class="paragraph"><p>This transformation is used to find filepairs that represent changes that touch a specified string, and is controlled by the -S option and the <tt>--pickaxe-all</tt> option to the <em>git diff-*</em> commands.</p></div> -<div class="para"><p>When diffcore-pickaxe is in use, it checks if there are +<div class="paragraph"><p>When diffcore-pickaxe is in use, it checks if there are filepairs whose "result" side and whose "origin" side have different number of specified string. Such a filepair represents "the string appeared in this changeset". It also checks for the opposite case that loses the specified string.</p></div> -<div class="para"><p>When <tt>--pickaxe-all</tt> is not in effect, diffcore-pickaxe leaves +<div class="paragraph"><p>When <tt>--pickaxe-all</tt> is not in effect, diffcore-pickaxe leaves only such filepairs that touch the specified string in its output. When <tt>--pickaxe-all</tt> is used, diffcore-pickaxe leaves all filepairs intact if there is such a filepair, or makes the @@ -566,14 +660,14 @@ </div> <h2 id="_diffcore_order_for_sorting_the_output_based_on_filenames">diffcore-order: For Sorting the Output Based on Filenames</h2> <div class="sectionbody"> -<div class="para"><p>This is used to reorder the filepairs according to the user's -(or project's) taste, and is controlled by the -O option to the +<div class="paragraph"><p>This is used to reorder the filepairs according to the user’s +(or project’s) taste, and is controlled by the -O option to the <em>git diff-*</em> commands.</p></div> -<div class="para"><p>This takes a text file each of whose lines is a shell glob +<div class="paragraph"><p>This takes a text file each of whose lines is a shell glob pattern. Filepairs that match a glob pattern on an earlier line in the file are output before ones that match a later line, and filepairs that do not match any glob pattern are output last.</p></div> -<div class="para"><p>As an example, a typical orderfile for the core git probably +<div class="paragraph"><p>As an example, a typical orderfile for the core git probably would look like this:</p></div> <div class="listingblock"> <div class="content"> @@ -587,22 +681,22 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-diff.html">git-diff(1)</a>, +<div class="paragraph"><p><a href="git-diff.html">git-diff(1)</a>, <a href="git-diff-files.html">git-diff-files(1)</a>, <a href="git-diff-index.html">git-diff-index(1)</a>, <a href="git-diff-tree.html">git-diff-tree(1)</a>, <a href="git-format-patch.html">git-format-patch(1)</a>, <a href="git-log.html">git-log(1)</a>, <a href="gitglossary.html">gitglossary(7)</a>, -<a href="user-manual.html">The Git User's Manual</a></p></div> +<a href="user-manual.html">The Git User’s Manual</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-30 00:03:01 UTC +Last updated 2010-09-30 00:01:59 UTC </div> </div> </body> diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 86c2034..ee0adca 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>gitrepository-layout(5)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>gitrepository-layout(5)</title> </head> <body> <div id="header"> @@ -318,20 +412,20 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p>$GIT_DIR/*</p></div> +<div class="paragraph"><p>$GIT_DIR/*</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>You may find these things in your git repository (<tt>.git</tt> +<div class="paragraph"><p>You may find these things in your git repository (<tt>.git</tt> directory for a repository associated with your working tree, or <tt><project>.git</tt> directory for a public <em>bare</em> repository. It is also possible to have a working tree where <tt>.git</tt> is a plain ASCII file containing <tt>gitdir: <path></tt>, i.e. the path to the real git repository).</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> objects </dt> <dd> @@ -342,7 +436,7 @@ found in it), but there are couple of ways to violate it. </p> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> You could populate the repository by running a commit walker @@ -372,7 +466,7 @@ </li> </ol></div> </dd> -<dt> +<dt class="hdlist1"> objects/[0-9a-f][0-9a-f] </dt> <dd> @@ -385,7 +479,7 @@ (or <em>loose</em>) objects. </p> </dd> -<dt> +<dt class="hdlist1"> objects/pack </dt> <dd> @@ -395,7 +489,7 @@ accessed) are found in this directory. </p> </dd> -<dt> +<dt class="hdlist1"> objects/info </dt> <dd> @@ -404,7 +498,7 @@ recorded in this directory. </p> </dd> -<dt> +<dt class="hdlist1"> objects/info/packs </dt> <dd> @@ -417,7 +511,7 @@ by default. </p> </dd> -<dt> +<dt class="hdlist1"> objects/info/alternates </dt> <dd> @@ -433,7 +527,7 @@ is the same. See also <em>objects/info/http-alternates</em>. </p> </dd> -<dt> +<dt class="hdlist1"> objects/info/http-alternates </dt> <dd> @@ -443,7 +537,7 @@ the repository is fetched over HTTP. </p> </dd> -<dt> +<dt class="hdlist1"> refs </dt> <dd> @@ -454,7 +548,7 @@ its subdirectories. </p> </dd> -<dt> +<dt class="hdlist1"> refs/heads/<tt>name</tt> </dt> <dd> @@ -462,7 +556,7 @@ records tip-of-the-tree commit objects of branch <tt>name</tt> </p> </dd> -<dt> +<dt class="hdlist1"> refs/tags/<tt>name</tt> </dt> <dd> @@ -471,7 +565,7 @@ object, or a tag object that points at a commit object). </p> </dd> -<dt> +<dt class="hdlist1"> refs/remotes/<tt>name</tt> </dt> <dd> @@ -480,7 +574,7 @@ from a remote repository. </p> </dd> -<dt> +<dt class="hdlist1"> packed-refs </dt> <dd> @@ -490,7 +584,7 @@ <a href="git-pack-refs.html">git-pack-refs(1)</a>. </p> </dd> -<dt> +<dt class="hdlist1"> HEAD </dt> <dd> @@ -506,13 +600,13 @@ a symbolic link instead of a symref that points at the current branch. </p> -<div class="para"><p>HEAD can also record a specific commit directly, instead of +<div class="paragraph"><p>HEAD can also record a specific commit directly, instead of being a symref to point at the current branch. Such a state is often called <em>detached HEAD</em>, and almost all commands work identically as normal. See <a href="git-checkout.html">git-checkout(1)</a> for details.</p></div> </dd> -<dt> +<dt class="hdlist1"> branches </dt> <dd> @@ -524,7 +618,7 @@ argument. </p> </dd> -<dt> +<dt class="hdlist1"> hooks </dt> <dd> @@ -538,7 +632,7 @@ each hook. </p> </dd> -<dt> +<dt class="hdlist1"> index </dt> <dd> @@ -547,7 +641,7 @@ usually not found in a bare repository. </p> </dd> -<dt> +<dt class="hdlist1"> info </dt> <dd> @@ -556,7 +650,7 @@ in this directory. </p> </dd> -<dt> +<dt class="hdlist1"> info/refs </dt> <dd> @@ -571,7 +665,7 @@ repository. </p> </dd> -<dt> +<dt class="hdlist1"> info/grafts </dt> <dd> @@ -584,7 +678,7 @@ by a space and terminated by a newline. </p> </dd> -<dt> +<dt class="hdlist1"> info/exclude </dt> <dd> @@ -596,7 +690,7 @@ at it. See also: <a href="gitignore.html">gitignore(5)</a>. </p> </dd> -<dt> +<dt class="hdlist1"> remotes </dt> <dd> @@ -606,7 +700,7 @@ <em>git fetch</em>, <em>git pull</em> and <em>git push</em> commands. </p> </dd> -<dt> +<dt class="hdlist1"> logs </dt> <dd> @@ -616,7 +710,7 @@ for more information. </p> </dd> -<dt> +<dt class="hdlist1"> logs/refs/heads/<tt>name</tt> </dt> <dd> @@ -624,7 +718,7 @@ Records all changes made to the branch tip named <tt>name</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> logs/refs/tags/<tt>name</tt> </dt> <dd> @@ -632,7 +726,7 @@ Records all changes made to the tag named <tt>name</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> shallow </dt> <dd> @@ -646,22 +740,22 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-init.html">git-init(1)</a>, +<div class="paragraph"><p><a href="git-init.html">git-init(1)</a>, <a href="git-clone.html">git-clone(1)</a>, <a href="git-fetch.html">git-fetch(1)</a>, <a href="git-pack-refs.html">git-pack-refs(1)</a>, <a href="git-gc.html">git-gc(1)</a>, <a href="git-checkout.html">git-checkout(1)</a>, <a href="gitglossary.html">gitglossary(7)</a>, -<a href="user-manual.html">The Git User's Manual</a></p></div> +<a href="user-manual.html">The Git User’s Manual</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:04 UTC +Last updated 2010-08-18 22:14:44 UTC </div> </div> </body> diff --git a/gitworkflows.html b/gitworkflows.html index cb21953..c256b4b 100644 --- a/gitworkflows.html +++ b/gitworkflows.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>gitworkflows(7)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>gitworkflows(7)</title> </head> <body> <div id="header"> @@ -318,32 +412,32 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p>git *</p></div> +<div class="paragraph"><p>git *</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>This document attempts to write down and motivate some of the workflow +<div class="paragraph"><p>This document attempts to write down and motivate some of the workflow elements used for <tt>git.git</tt> itself. Many ideas apply in general, though the full workflow is rarely required for smaller projects with fewer people involved.</p></div> -<div class="para"><p>We formulate a set of <em>rules</em> for quick reference, while the prose +<div class="paragraph"><p>We formulate a set of <em>rules</em> for quick reference, while the prose tries to motivate each of them. Do not always take them literally; you should value good reasons for your actions higher than manpages such as this one.</p></div> </div> <h2 id="_separate_changes">SEPARATE CHANGES</h2> <div class="sectionbody"> -<div class="para"><p>As a general rule, you should try to split your changes into small +<div class="paragraph"><p>As a general rule, you should try to split your changes into small logical steps, and commit each of them. They should be consistent, working independently of any later commits, pass the test suite, etc. This makes the review process much easier, and the history much more useful for later inspection and analysis, for example with <a href="git-blame.html">git-blame(1)</a> and <a href="git-bisect.html">git-bisect(1)</a>.</p></div> -<div class="para"><p>To achieve this, try to split your work into small steps from the very +<div class="paragraph"><p>To achieve this, try to split your work into small steps from the very beginning. It is always easier to squash a few commits together than -to split one big commit into several. Don't be afraid of making too +to split one big commit into several. Don’t be afraid of making too small or imperfect steps along the way. You can always go back later and edit the commits with <tt>git rebase --interactive</tt> before you publish them. You can use <tt>git stash save --keep-index</tt> to run the @@ -352,26 +446,26 @@ </div> <h2 id="_managing_branches">MANAGING BRANCHES</h2> <div class="sectionbody"> -<div class="para"><p>There are two main tools that can be used to include changes from one +<div class="paragraph"><p>There are two main tools that can be used to include changes from one branch on another: <a href="git-merge.html">git-merge(1)</a> and <a href="git-cherry-pick.html">git-cherry-pick(1)</a>.</p></div> -<div class="para"><p>Merges have many advantages, so we try to solve as many problems as +<div class="paragraph"><p>Merges have many advantages, so we try to solve as many problems as possible with merges alone. Cherry-picking is still occasionally useful; see "Merging upwards" below for an example.</p></div> -<div class="para"><p>Most importantly, merging works at the branch level, while +<div class="paragraph"><p>Most importantly, merging works at the branch level, while cherry-picking works at the commit level. This means that a merge can carry over the changes from 1, 10, or 1000 commits with equal ease, which in turn means the workflow scales much better to a large number of contributors (and contributions). Merges are also easier to understand because a merge commit is a "promise" that all changes from all its parents are now included.</p></div> -<div class="para"><p>There is a tradeoff of course: merges require a more careful branch +<div class="paragraph"><p>There is a tradeoff of course: merges require a more careful branch management. The following subsections discuss the important points.</p></div> <h3 id="_graduation">Graduation</h3><div style="clear:left"></div> -<div class="para"><p>As a given feature goes from experimental to stable, it also +<div class="paragraph"><p>As a given feature goes from experimental to stable, it also "graduates" between the corresponding branches of the software. <tt>git.git</tt> uses the following <em>integration branches</em>:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <em>maint</em> tracks the commits that should go into the next "maintenance @@ -390,8 +484,8 @@ </p> </li> </ul></div> -<div class="para"><p>There is a fourth official branch that is used slightly differently:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>There is a fourth official branch that is used slightly differently:</p></div> +<div class="ulist"><ul> <li> <p> <em>pu</em> (proposed updates) is an integration branch for things that are @@ -400,47 +494,47 @@ </p> </li> </ul></div> -<div class="para"><p>Each of the four branches is usually a direct descendant of the one +<div class="paragraph"><p>Each of the four branches is usually a direct descendant of the one above it.</p></div> -<div class="para"><p>Conceptually, the feature enters at an unstable branch (usually <em>next</em> +<div class="paragraph"><p>Conceptually, the feature enters at an unstable branch (usually <em>next</em> or <em>pu</em>), and "graduates" to <em>master</em> for the next release once it is considered stable enough.</p></div> <h3 id="_merging_upwards">Merging upwards</h3><div style="clear:left"></div> -<div class="para"><p>The "downwards graduation" discussed above cannot be done by actually +<div class="paragraph"><p>The "downwards graduation" discussed above cannot be done by actually merging downwards, however, since that would merge <em>all</em> changes on the unstable branch into the stable one. Hence the following:</p></div> <div class="exampleblock"> <div class="title">Rule: Merge upwards</div> <div class="exampleblock-content"> -<div class="para"><p>Always commit your fixes to the oldest supported branch that require +<div class="paragraph"><p>Always commit your fixes to the oldest supported branch that require them. Then (periodically) merge the integration branches upwards into each other.</p></div> </div></div> -<div class="para"><p>This gives a very controlled flow of fixes. If you notice that you +<div class="paragraph"><p>This gives a very controlled flow of fixes. If you notice that you have applied a fix to e.g. <em>master</em> that is also required in <em>maint</em>, you will need to cherry-pick it (using <a href="git-cherry-pick.html">git-cherry-pick(1)</a>) downwards. This will happen a few times and is nothing to worry about unless you do it very frequently.</p></div> <h3 id="_topic_branches">Topic branches</h3><div style="clear:left"></div> -<div class="para"><p>Any nontrivial feature will require several patches to implement, and +<div class="paragraph"><p>Any nontrivial feature will require several patches to implement, and may get extra bugfixes or improvements during its lifetime.</p></div> -<div class="para"><p>Committing everything directly on the integration branches leads to many +<div class="paragraph"><p>Committing everything directly on the integration branches leads to many problems: Bad commits cannot be undone, so they must be reverted one by one, which creates confusing histories and further error potential when you forget to revert part of a group of changes. Working in parallel mixes up the changes, creating further confusion.</p></div> -<div class="para"><p>Use of "topic branches" solves these problems. The name is pretty +<div class="paragraph"><p>Use of "topic branches" solves these problems. The name is pretty self explanatory, with a caveat that comes from the "merge upwards" rule above:</p></div> <div class="exampleblock"> <div class="title">Rule: Topic branches</div> <div class="exampleblock-content"> -<div class="para"><p>Make a side branch for every topic (feature, bugfix, …). Fork it off +<div class="paragraph"><p>Make a side branch for every topic (feature, bugfix, …). Fork it off at the oldest integration branch that you will eventually want to merge it into.</p></div> </div></div> -<div class="para"><p>Many things can then be done very naturally:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Many things can then be done very naturally:</p></div> +<div class="ulist"><ul> <li> <p> To get the feature/bugfix into an integration branch, simply merge @@ -465,97 +559,96 @@ </p> </li> </ul></div> -<div class="para"><p>Note that the last point clashes with the other two: a topic that has +<div class="paragraph"><p>Note that the last point clashes with the other two: a topic that has been merged elsewhere should not be rebased. See the section on RECOVERING FROM UPSTREAM REBASE in <a href="git-rebase.html">git-rebase(1)</a>.</p></div> -<div class="para"><p>We should point out that "habitually" (regularly for no real reason) -merging an integration branch into your topics — and by extension, -merging anything upstream into anything downstream on a regular basis -— is frowned upon:</p></div> +<div class="paragraph"><p>We should point out that "habitually" (regularly for no real reason) +merging an integration branch into your topics — and by extension, +merging anything upstream into anything downstream on a regular basis — is frowned upon:</p></div> <div class="exampleblock"> <div class="title">Rule: Merge to downstream only at well-defined points</div> <div class="exampleblock-content"> -<div class="para"><p>Do not merge to downstream except with a good reason: upstream API +<div class="paragraph"><p>Do not merge to downstream except with a good reason: upstream API changes affect your branch; your branch no longer merges to upstream cleanly; etc.</p></div> </div></div> -<div class="para"><p>Otherwise, the topic that was merged to suddenly contains more than a +<div class="paragraph"><p>Otherwise, the topic that was merged to suddenly contains more than a single (well-separated) change. The many resulting small merges will greatly clutter up history. Anyone who later investigates the history of a file will have to find out whether that merge affected the topic in development. An upstream might even inadvertently be merged into a "more stable" branch. And so on.</p></div> <h3 id="_throw_away_integration">Throw-away integration</h3><div style="clear:left"></div> -<div class="para"><p>If you followed the last paragraph, you will now have many small topic +<div class="paragraph"><p>If you followed the last paragraph, you will now have many small topic branches, and occasionally wonder how they interact. Perhaps the result of merging them does not even work? But on the other hand, we want to avoid merging them anywhere "stable" because such merges cannot easily be undone.</p></div> -<div class="para"><p>The solution, of course, is to make a merge that we can undo: merge +<div class="paragraph"><p>The solution, of course, is to make a merge that we can undo: merge into a throw-away branch.</p></div> <div class="exampleblock"> <div class="title">Rule: Throw-away integration branches</div> <div class="exampleblock-content"> -<div class="para"><p>To test the interaction of several topics, merge them into a +<div class="paragraph"><p>To test the interaction of several topics, merge them into a throw-away branch. You must never base any work on such a branch!</p></div> </div></div> -<div class="para"><p>If you make it (very) clear that this branch is going to be deleted +<div class="paragraph"><p>If you make it (very) clear that this branch is going to be deleted right after the testing, you can even publish this branch, for example to give the testers a chance to work with it, or other developers a chance to see if their in-progress work will be compatible. <tt>git.git</tt> has such an official throw-away integration branch called <em>pu</em>.</p></div> <h3 id="_branch_management_for_a_release">Branch management for a release</h3><div style="clear:left"></div> -<div class="para"><p>Assuming you are using the merge approach discussed above, when you +<div class="paragraph"><p>Assuming you are using the merge approach discussed above, when you are releasing your project you will need to do some additional branch management work.</p></div> -<div class="para"><p>A feature release is created from the <em>master</em> branch, since <em>master</em> +<div class="paragraph"><p>A feature release is created from the <em>master</em> branch, since <em>master</em> tracks the commits that should go into the next feature release.</p></div> -<div class="para"><p>The <em>master</em> branch is supposed to be a superset of <em>maint</em>. If this +<div class="paragraph"><p>The <em>master</em> branch is supposed to be a superset of <em>maint</em>. If this condition does not hold, then <em>maint</em> contains some commits that are not included on <em>master</em>. The fixes represented by those commits will therefore not be included in your feature release.</p></div> -<div class="para"><p>To verify that <em>master</em> is indeed a superset of <em>maint</em>, use git log:</p></div> +<div class="paragraph"><p>To verify that <em>master</em> is indeed a superset of <em>maint</em>, use git log:</p></div> <div class="exampleblock"> <div class="title">Recipe: Verify <em>master</em> is a superset of <em>maint</em></div> <div class="exampleblock-content"> -<div class="para"><p><tt>git log master..maint</tt></p></div> +<div class="paragraph"><p><tt>git log master..maint</tt></p></div> </div></div> -<div class="para"><p>This command should not list any commits. Otherwise, check out +<div class="paragraph"><p>This command should not list any commits. Otherwise, check out <em>master</em> and merge <em>maint</em> into it.</p></div> -<div class="para"><p>Now you can proceed with the creation of the feature release. Apply a +<div class="paragraph"><p>Now you can proceed with the creation of the feature release. Apply a tag to the tip of <em>master</em> indicating the release version:</p></div> <div class="exampleblock"> <div class="title">Recipe: Release tagging</div> <div class="exampleblock-content"> -<div class="para"><p><tt>git tag -s -m "GIT X.Y.Z" vX.Y.Z master</tt></p></div> +<div class="paragraph"><p><tt>git tag -s -m "GIT X.Y.Z" vX.Y.Z master</tt></p></div> </div></div> -<div class="para"><p>You need to push the new tag to a public git server (see +<div class="paragraph"><p>You need to push the new tag to a public git server (see "DISTRIBUTED WORKFLOWS" below). This makes the tag available to others tracking your project. The push could also trigger a post-update hook to perform release-related items such as building release tarballs and preformatted documentation pages.</p></div> -<div class="para"><p>Similarly, for a maintenance release, <em>maint</em> is tracking the commits +<div class="paragraph"><p>Similarly, for a maintenance release, <em>maint</em> is tracking the commits to be released. Therefore, in the steps above simply tag and push <em>maint</em> rather than <em>master</em>.</p></div> <h3 id="_maintenance_branch_management_after_a_feature_release">Maintenance branch management after a feature release</h3><div style="clear:left"></div> -<div class="para"><p>After a feature release, you need to manage your maintenance branches.</p></div> -<div class="para"><p>First, if you wish to continue to release maintenance fixes for the +<div class="paragraph"><p>After a feature release, you need to manage your maintenance branches.</p></div> +<div class="paragraph"><p>First, if you wish to continue to release maintenance fixes for the feature release made before the recent one, then you must create another branch to track commits for that previous release.</p></div> -<div class="para"><p>To do this, the current maintenance branch is copied to another branch +<div class="paragraph"><p>To do this, the current maintenance branch is copied to another branch named with the previous release version number (e.g. maint-X.Y.(Z-1) where X.Y.Z is the current release).</p></div> <div class="exampleblock"> <div class="title">Recipe: Copy maint</div> <div class="exampleblock-content"> -<div class="para"><p><tt>git branch maint-X.Y.(Z-1) maint</tt></p></div> +<div class="paragraph"><p><tt>git branch maint-X.Y.(Z-1) maint</tt></p></div> </div></div> -<div class="para"><p>The <em>maint</em> branch should now be fast-forwarded to the newly released +<div class="paragraph"><p>The <em>maint</em> branch should now be fast-forwarded to the newly released code so that maintenance fixes can be tracked for the current release:</p></div> <div class="exampleblock"> <div class="title">Recipe: Update maint to new release</div> <div class="exampleblock-content"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>git checkout maint</tt> @@ -568,18 +661,18 @@ </li> </ul></div> </div></div> -<div class="para"><p>If the merge fails because it is not a fast-forward, then it is +<div class="paragraph"><p>If the merge fails because it is not a fast-forward, then it is possible some fixes on <em>maint</em> were missed in the feature release. This will not happen if the content of the branches was verified as described in the previous section.</p></div> <h3 id="_branch_management_for_next_and_pu_after_a_feature_release">Branch management for next and pu after a feature release</h3><div style="clear:left"></div> -<div class="para"><p>After a feature release, the integration branch <em>next</em> may optionally be +<div class="paragraph"><p>After a feature release, the integration branch <em>next</em> may optionally be rewound and rebuilt from the tip of <em>master</em> using the surviving topics on <em>next</em>:</p></div> <div class="exampleblock"> <div class="title">Recipe: Rewind and rebuild next</div> <div class="exampleblock-content"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>git checkout next</tt> @@ -607,7 +700,7 @@ </li> </ul></div> </div></div> -<div class="para"><p>The advantage of doing this is that the history of <em>next</em> will be +<div class="paragraph"><p>The advantage of doing this is that the history of <em>next</em> will be clean. For example, some topics merged into <em>next</em> may have initially looked promising, but were later found to be undesirable or premature. In such a case, the topic is reverted out of <em>next</em> but the fact @@ -615,32 +708,32 @@ recreating <em>next</em>, you give another incarnation of such topics a clean slate to retry, and a feature release is a good point in history to do so.</p></div> -<div class="para"><p>If you do this, then you should make a public announcement indicating +<div class="paragraph"><p>If you do this, then you should make a public announcement indicating that <em>next</em> was rewound and rebuilt.</p></div> -<div class="para"><p>The same rewind and rebuild process may be followed for <em>pu</em>. A public +<div class="paragraph"><p>The same rewind and rebuild process may be followed for <em>pu</em>. A public announcement is not necessary since <em>pu</em> is a throw-away branch, as described above.</p></div> </div> <h2 id="_distributed_workflows">DISTRIBUTED WORKFLOWS</h2> <div class="sectionbody"> -<div class="para"><p>After the last section, you should know how to manage topics. In +<div class="paragraph"><p>After the last section, you should know how to manage topics. In general, you will not be the only person working on the project, so you will have to share your work.</p></div> -<div class="para"><p>Roughly speaking, there are two important workflows: merge and patch. +<div class="paragraph"><p>Roughly speaking, there are two important workflows: merge and patch. The important difference is that the merge workflow can propagate full history, including merges, while patches cannot. Both workflows can be used in parallel: in <tt>git.git</tt>, only subsystem maintainers use the merge workflow, while everyone else sends patches.</p></div> -<div class="para"><p>Note that the maintainer(s) may impose restrictions, such as +<div class="paragraph"><p>Note that the maintainer(s) may impose restrictions, such as "Signed-off-by" requirements, that all commits/patches submitted for -inclusion must adhere to. Consult your project's documentation for +inclusion must adhere to. Consult your project’s documentation for more information.</p></div> <h3 id="_merge_workflow">Merge workflow</h3><div style="clear:left"></div> -<div class="para"><p>The merge workflow works by copying branches between upstream and +<div class="paragraph"><p>The merge workflow works by copying branches between upstream and downstream. Upstream can merge contributions into the official history; downstream base their work on the official history.</p></div> -<div class="para"><p>There are three main tools that can be used for this:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>There are three main tools that can be used for this:</p></div> +<div class="ulist"><ul> <li> <p> <a href="git-push.html">git-push(1)</a> copies your branches to a remote repository, @@ -659,28 +752,28 @@ </p> </li> </ul></div> -<div class="para"><p>Note the last point. Do <em>not</em> use <em>git pull</em> unless you actually want +<div class="paragraph"><p>Note the last point. Do <em>not</em> use <em>git pull</em> unless you actually want to merge the remote branch.</p></div> -<div class="para"><p>Getting changes out is easy:</p></div> +<div class="paragraph"><p>Getting changes out is easy:</p></div> <div class="exampleblock"> <div class="title">Recipe: Push/pull: Publishing branches/topics</div> <div class="exampleblock-content"> -<div class="para"><p><tt>git push <remote> <branch></tt> and tell everyone where they can fetch +<div class="paragraph"><p><tt>git push <remote> <branch></tt> and tell everyone where they can fetch from.</p></div> </div></div> -<div class="para"><p>You will still have to tell people by other means, such as mail. (Git +<div class="paragraph"><p>You will still have to tell people by other means, such as mail. (Git provides the <a href="git-request-pull.html">git-request-pull(1)</a> to send preformatted pull requests to upstream maintainers to simplify this task.)</p></div> -<div class="para"><p>If you just want to get the newest copies of the integration branches, +<div class="paragraph"><p>If you just want to get the newest copies of the integration branches, staying up to date is easy too:</p></div> <div class="exampleblock"> <div class="title">Recipe: Push/pull: Staying up to date</div> <div class="exampleblock-content"> -<div class="para"><p>Use <tt>git fetch <remote></tt> or <tt>git remote update</tt> to stay up to date.</p></div> +<div class="paragraph"><p>Use <tt>git fetch <remote></tt> or <tt>git remote update</tt> to stay up to date.</p></div> </div></div> -<div class="para"><p>Then simply fork your topic branches from the stable remotes as +<div class="paragraph"><p>Then simply fork your topic branches from the stable remotes as explained earlier.</p></div> -<div class="para"><p>If you are a maintainer and would like to merge other people's topic +<div class="paragraph"><p>If you are a maintainer and would like to merge other people’s topic branches to the integration branches, they will typically send a request to do so by mail. Such a request looks like</p></div> <div class="listingblock"> @@ -688,28 +781,28 @@ <pre><tt>Please pull from <url> <branch></tt></pre> </div></div> -<div class="para"><p>In that case, <em>git pull</em> can do the fetch and merge in one go, as +<div class="paragraph"><p>In that case, <em>git pull</em> can do the fetch and merge in one go, as follows.</p></div> <div class="exampleblock"> <div class="title">Recipe: Push/pull: Merging remote topics</div> <div class="exampleblock-content"> -<div class="para"><p><tt>git pull <url> <branch></tt></p></div> +<div class="paragraph"><p><tt>git pull <url> <branch></tt></p></div> </div></div> -<div class="para"><p>Occasionally, the maintainer may get merge conflicts when he tries to +<div class="paragraph"><p>Occasionally, the maintainer may get merge conflicts when he tries to pull changes from downstream. In this case, he can ask downstream to do the merge and resolve the conflicts themselves (perhaps they will know better how to resolve them). It is one of the rare cases where downstream <em>should</em> merge from upstream.</p></div> <h3 id="_patch_workflow">Patch workflow</h3><div style="clear:left"></div> -<div class="para"><p>If you are a contributor that sends changes upstream in the form of +<div class="paragraph"><p>If you are a contributor that sends changes upstream in the form of emails, you should use topic branches as usual (see above). Then use <a href="git-format-patch.html">git-format-patch(1)</a> to generate the corresponding emails (highly recommended over manually formatting them because it makes the -maintainer's life easier).</p></div> +maintainer’s life easier).</p></div> <div class="exampleblock"> <div class="title">Recipe: format-patch/am: Publishing branches/topics</div> <div class="exampleblock-content"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>git format-patch -M upstream..topic</tt> to turn them into preformatted @@ -723,35 +816,35 @@ </li> </ul></div> </div></div> -<div class="para"><p>See the <a href="git-format-patch.html">git-format-patch(1)</a> and <a href="git-send-email.html">git-send-email(1)</a> +<div class="paragraph"><p>See the <a href="git-format-patch.html">git-format-patch(1)</a> and <a href="git-send-email.html">git-send-email(1)</a> manpages for further usage notes.</p></div> -<div class="para"><p>If the maintainer tells you that your patch no longer applies to the +<div class="paragraph"><p>If the maintainer tells you that your patch no longer applies to the current upstream, you will have to rebase your topic (you cannot use a merge because you cannot format-patch merges):</p></div> <div class="exampleblock"> <div class="title">Recipe: format-patch/am: Keeping topics up to date</div> <div class="exampleblock-content"> -<div class="para"><p><tt>git pull --rebase <url> <branch></tt></p></div> +<div class="paragraph"><p><tt>git pull --rebase <url> <branch></tt></p></div> </div></div> -<div class="para"><p>You can then fix the conflicts during the rebase. Presumably you have +<div class="paragraph"><p>You can then fix the conflicts during the rebase. Presumably you have not published your topic other than by mail, so rebasing it is not a problem.</p></div> -<div class="para"><p>If you receive such a patch series (as maintainer, or perhaps as a +<div class="paragraph"><p>If you receive such a patch series (as maintainer, or perhaps as a reader of the mailing list it was sent to), save the mails to files, create a new topic branch and use <em>git am</em> to import the commits:</p></div> <div class="exampleblock"> <div class="title">Recipe: format-patch/am: Importing patches</div> <div class="exampleblock-content"> -<div class="para"><p><tt>git am < patch</tt></p></div> +<div class="paragraph"><p><tt>git am < patch</tt></p></div> </div></div> -<div class="para"><p>One feature worth pointing out is the three-way merge, which can help +<div class="paragraph"><p>One feature worth pointing out is the three-way merge, which can help if you get conflicts: <tt>git am -3</tt> will use index information contained in patches to figure out the merge base. See <a href="git-am.html">git-am(1)</a> for other options.</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, +<div class="paragraph"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="git-push.html">git-push(1)</a>, <a href="git-pull.html">git-pull(1)</a>, <a href="git-merge.html">git-merge(1)</a>, @@ -762,11 +855,11 @@ </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:07 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> diff --git a/howto-index.html b/howto-index.html index 61db85a..3a5631a 100644 --- a/howto-index.html +++ b/howto-index.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>GIT Howto Index</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>GIT Howto Index</title> </head> <body> <div id="header"> @@ -311,95 +388,95 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Here is a collection of mailing list postings made by various +<div class="paragraph"><p>Here is a collection of mailing list postings made by various people describing how they use git in their workflow.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<a href="howto/maintain-git.txt">maintain-git</a> by Junio C Hamano <gitster@pobox.com> +<a href="howto/maintain-git.txt">maintain-git</a> by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> </p> </li> </ul></div> -<div class="para"><p>Imagine that git development is racing along as usual, when our friendly +<div class="paragraph"><p>Imagine that git development is racing along as usual, when our friendly neighborhood maintainer is struck down by a wayward bus. Out of the hordes of suckers (loyal developers), you have been tricked (chosen) to step up as the new maintainer. This howto will show you "how to" do it.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<a href="howto/rebase-from-internal-branch.txt">rebase-from-internal-branch</a> by Junio C Hamano <gitster@pobox.com> +<a href="howto/rebase-from-internal-branch.txt">rebase-from-internal-branch</a> by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> </p> </li> </ul></div> -<div class="para"><p>In this article, JC talks about how he rebases the +<div class="paragraph"><p>In this article, JC talks about how he rebases the public "pu" branch using the core GIT tools when he updates the "master" branch, and how "rebase" works. Also discussed is how this applies to individual developers who sends patches upstream.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<a href="howto/rebuild-from-update-hook.txt">rebuild-from-update-hook</a> by Junio C Hamano <gitster@pobox.com> +<a href="howto/rebuild-from-update-hook.txt">rebuild-from-update-hook</a> by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> </p> </li> </ul></div> -<div class="para"><p>In this how-to article, JC talks about how he +<div class="paragraph"><p>In this how-to article, JC talks about how he uses the post-update hook to automate git documentation page -shown at http://www.kernel.org/pub/software/scm/git/docs/.</p></div> -<div class="ilist"><ul> +shown at <a href="http://www.kernel.org/pub/software/scm/git/docs/">http://www.kernel.org/pub/software/scm/git/docs/</a>.</p></div> +<div class="ulist"><ul> <li> <p> -<a href="howto/recover-corrupted-blob-object.txt">recover-corrupted-blob-object</a> by Linus Torvalds <torvalds@linux-foundation.org> +<a href="howto/recover-corrupted-blob-object.txt">recover-corrupted-blob-object</a> by Linus Torvalds <<a href="mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org</a>> </p> </li> </ul></div> -<div class="para"><p>Some tricks to reconstruct blob objects in order to fix +<div class="paragraph"><p>Some tricks to reconstruct blob objects in order to fix a corrupted repository.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge</a> by Linus Torvalds <torvalds@linux-foundation.org>, Junio C Hamano <gitster@pobox.com> +<a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge</a> by Linus Torvalds <<a href="mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org</a>>, Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> </p> </li> </ul></div> -<div class="para"><p>Sometimes a branch that was already merged to the mainline +<div class="paragraph"><p>Sometimes a branch that was already merged to the mainline is later found to be faulty. Linus and Junio give guidance on recovering from such a premature merge and continuing development after the offending branch is fixed.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<a href="howto/revert-branch-rebase.html">revert-branch-rebase</a> by Junio C Hamano <gitster@pobox.com> +<a href="howto/revert-branch-rebase.html">revert-branch-rebase</a> by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> </p> </li> </ul></div> -<div class="para"><p>In this article, JC gives a small real-life example of using +<div class="paragraph"><p>In this article, JC gives a small real-life example of using <em>git revert</em> command, and using a temporary branch and tag for safety and easier sanity checking.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> -<a href="howto/separating-topic-branches.txt">separating-topic-branches</a> by Junio C Hamano <gitster@pobox.com> +<a href="howto/separating-topic-branches.txt">separating-topic-branches</a> by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> </p> </li> </ul></div> -<div class="para"><p>In this article, JC describes how to separate topic branches.</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>In this article, JC describes how to separate topic branches.</p></div> +<div class="ulist"><ul> <li> <p> -<a href="howto/setup-git-server-over-http.txt">setup-git-server-over-http</a> by Rutger Nijlunsing <rutger@nospam.com> +<a href="howto/setup-git-server-over-http.txt">setup-git-server-over-http</a> by Rutger Nijlunsing <<a href="mailto:rutger@nospam.com">rutger@nospam.com</a>> </p> </li> <li> <p> -<a href="howto/update-hook-example.txt">update-hook-example</a> by Junio C Hamano <gitster@pobox.com> and Carl Baldwin <cnb@fc.hp.com> +<a href="howto/update-hook-example.txt">update-hook-example</a> by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> and Carl Baldwin <<a href="mailto:cnb@fc.hp.com">cnb@fc.hp.com</a>> </p> </li> </ul></div> -<div class="para"><p>An example hooks/update script is presented to +<div class="paragraph"><p>An example hooks/update script is presented to implement repository maintenance policies, such as who can push into which branch and who can make a tag.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <a href="howto/use-git-daemon.txt">use-git-daemon</a> @@ -407,17 +484,17 @@ </li> <li> <p> -<a href="howto/using-merge-subtree.html">using-merge-subtree</a> by Sean <seanlkml@sympatico.ca> +<a href="howto/using-merge-subtree.html">using-merge-subtree</a> by Sean <<a href="mailto:seanlkml@sympatico.ca">seanlkml@sympatico.ca</a>> </p> </li> </ul></div> -<div class="para"><p>In this article, Sean demonstrates how one can use the subtree merge +<div class="paragraph"><p>In this article, Sean demonstrates how one can use the subtree merge strategy.</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:16 UTC +Last updated 2011-01-31 05:00:31 UTC </div> </div> </body> diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 201ee3f..41bd5f0 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>Reverting an existing commit</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>Reverting an existing commit</title> </head> <body> <div id="header"> @@ -311,18 +388,18 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>One of the changes I pulled into the <em>master</em> branch turns out to +<div class="paragraph"><p>One of the changes I pulled into the <em>master</em> branch turns out to break building GIT with GCC 2.95. While they were well intentioned portability fixes, keeping things working with gcc-2.95 was also important. Here is what I did to revert the change in the <em>master</em> branch and to adjust the <em>pu</em> branch, using core GIT tools and barebone Porcelain.</p></div> -<div class="para"><p>First, prepare a throw-away branch in case I screw things up.</p></div> +<div class="paragraph"><p>First, prepare a throw-away branch in case I screw things up.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -b revert-c99 master</tt></pre> </div></div> -<div class="para"><p>Now I am on the <em>revert-c99</em> branch. Let's figure out which commit to +<div class="paragraph"><p>Now I am on the <em>revert-c99</em> branch. Let’s figure out which commit to revert. I happen to know that the top of the <em>master</em> branch is a merge, and its second parent (i.e. foreign commit I merged from) has the change I would want to undo. Further I happen to know that that @@ -341,13 +418,13 @@ *+ [master^2~4] Replace zero-length array decls with []. * [master~1] tutorial note about git branch</tt></pre> </div></div> -<div class="para"><p>The <em>—more=4</em> above means "after we reach the merge base of refs, +<div class="paragraph"><p>The <em>--more=4</em> above means "after we reach the merge base of refs, show until we display four more common commits". That last commit would have been where the "portable" branch was forked from the main git.git repository, so this would show everything on both branches since then. I just limited the output to the first handful using <em>head</em>.</p></div> -<div class="para"><p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of +<div class="paragraph"><p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of the <em>master</em>, and then go four generations back following the first parent") is the one I would want to revert. Since I also want to say why I am reverting it, the <em>-n</em> flag is given to <em>git revert</em>. This @@ -364,15 +441,15 @@ $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage. $ make clean test ;# make sure it did not cause other breakage.</tt></pre> </div></div> -<div class="para"><p>The reverted change makes sense (from reading the <em>diff</em> output), does +<div class="paragraph"><p>The reverted change makes sense (from reading the <em>diff</em> output), does fix the problem (from <em>make CC=gcc-2.95</em> test), and does not cause new -breakage (from the last <em>make test</em>). I'm ready to commit:</p></div> +breakage (from the last <em>make test</em>). I’m ready to commit:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit -a -s ;# read .msg into the log, # and explain why I am reverting.</tt></pre> </div></div> -<div class="para"><p>I could have screwed up in any of the above steps, but in the worst +<div class="paragraph"><p>I could have screwed up in any of the above steps, but in the worst case I could just have done <em>git checkout master</em> to start over. Fortunately I did not have to; what I have in the current branch <em>revert-c99</em> is what I want. So merge that back into <em>master</em>:</p></div> @@ -388,14 +465,14 @@ server-info.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre> </div></div> -<div class="para"><p>There is no need to redo the test at this point. We fast-forwarded +<div class="paragraph"><p>There is no need to redo the test at this point. We fast-forwarded and we know <em>master</em> matches <em>revert-c99</em> exactly. In fact:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff master..revert-c99</tt></pre> </div></div> -<div class="para"><p>says nothing.</p></div> -<div class="para"><p>Then we rebase the <em>pu</em> branch as usual.</p></div> +<div class="paragraph"><p>says nothing.</p></div> +<div class="paragraph"><p>Then we rebase the <em>pu</em> branch as usual.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout pu @@ -417,7 +494,7 @@ * Applying: More documentation updates. First trying simple merge strategy to cherry-pick.</tt></pre> </div></div> -<div class="para"><p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git +<div class="paragraph"><p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git rebase</em> screws up. After this, I can do these for sanity check:</p></div> <div class="listingblock"> <div class="content"> @@ -425,14 +502,14 @@ $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage. $ make clean test ;# make sure it did not cause other breakage.</tt></pre> </div></div> -<div class="para"><p>Everything is in the good order. I do not need the temporary branch +<div class="paragraph"><p>Everything is in the good order. I do not need the temporary branch nor tag anymore, so remove them:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ rm -f .git/refs/tags/pu-anchor $ git branch -d revert-c99</tt></pre> </div></div> -<div class="para"><p>It was an emergency fix, so we might as well merge it into the +<div class="paragraph"><p>It was an emergency fix, so we might as well merge it into the <em>release candidate</em> branch, although I expect the next release would be some days off:</p></div> <div class="listingblock"> @@ -452,7 +529,7 @@ server-info.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre> </div></div> -<div class="para"><p>And the final repository status looks like this:</p></div> +<div class="paragraph"><p>And the final repository status looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch --more=1 master pu rc @@ -476,7 +553,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:08 UTC +Last updated 2011-01-31 05:00:33 UTC </div> </div> </body> diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index da804b8..322188a 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>How to use the subtree merge strategy</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>How to use the subtree merge strategy</title> </head> <body> <div id="header"> @@ -311,31 +388,31 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>There are situations where you want to include contents in your project +<div class="paragraph"><p>There are situations where you want to include contents in your project from an independently developed project. You can just pull from the other project as long as there are no conflicting paths.</p></div> -<div class="para"><p>The problematic case is when there are conflicting files. Potential +<div class="paragraph"><p>The problematic case is when there are conflicting files. Potential candidates are Makefiles and other standard filenames. You could merge these files but probably you do not want to. A better solution for this problem can be to merge the project as its own subdirectory. This is not -supported by the <em>recursive</em> merge strategy, so just pulling won't work.</p></div> -<div class="para"><p>What you want is the <em>subtree</em> merge strategy, which helps you in such a +supported by the <em>recursive</em> merge strategy, so just pulling won’t work.</p></div> +<div class="paragraph"><p>What you want is the <em>subtree</em> merge strategy, which helps you in such a situation.</p></div> -<div class="para"><p>In this example, let's say you have the repository at <tt>/path/to/B</tt> (but +<div class="paragraph"><p>In this example, let’s say you have the repository at <tt>/path/to/B</tt> (but it can be an URL as well, if you want). You want to merge the <em>master</em> branch of that repository to the <tt>dir-B</tt> subdirectory in your current branch.</p></div> -<div class="para"><p>Here is the command sequence you need:</p></div> +<div class="paragraph"><p>Here is the command sequence you need:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt>$ git remote add -f Bproject /path/to/B <b>(1)</b> -$ git merge -s ours --no-commit Bproject/master <b>(2)</b> -$ git read-tree --prefix=dir-B/ -u Bproject/master <b>(3)</b> -$ git commit -m "Merge B project as our subdirectory" <b>(4)</b> +<pre><tt>$ git remote add -f Bproject /path/to/B <b><1></b> +$ git merge -s ours --no-commit Bproject/master <b><2></b> +$ git read-tree --prefix=dir-B/ -u Bproject/master <b><3></b> +$ git commit -m "Merge B project as our subdirectory" <b><4></b> -$ git pull -s subtree Bproject master <b>(5)</b></tt></pre> +$ git pull -s subtree Bproject master <b><5></b></tt></pre> </div></div> -<div class="colist"><ol> +<div class="colist arabic"><ol> <li> <p> name the other project "Bproject", and fetch. @@ -362,13 +439,13 @@ </p> </li> </ol></div> -<div class="para"><p>The first four commands are used for the initial merge, while the last +<div class="paragraph"><p>The first four commands are used for the initial merge, while the last one is to merge updates from <em>B project</em>.</p></div> </div> </div> <h2 id="_comparing_em_subtree_em_merge_with_submodules">Comparing <em>subtree</em> merge with submodules</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> The benefit of using subtree merge is that it requires less @@ -393,11 +470,11 @@ </div> <h2 id="_additional_tips">Additional tips</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> If you made changes to the other project in your repository, they may - want to merge from your project. This is possible using subtree — it + want to merge from your project. This is possible using subtree — it can shift up the paths in your tree and then they can merge only the relevant parts of your tree. </p> @@ -405,7 +482,7 @@ <li> <p> Please note that if the other project merges from you, then it will - connects its history to yours, which can be something they don't want + connects its history to yours, which can be something they don’t want to. </p> </li> @@ -413,7 +490,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:08 UTC +Last updated 2011-01-31 05:00:33 UTC </div> </div> </body> diff --git a/technical/api-allocation-growing.html b/technical/api-allocation-growing.html index fbbaad4..43e45d9 100644 --- a/technical/api-allocation-growing.html +++ b/technical/api-allocation-growing.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>allocation growing API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>allocation growing API</title> </head> <body> <div id="header"> @@ -311,9 +388,9 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Dynamically growing an array using realloc() is error prone and boring.</p></div> -<div class="para"><p>Define your array with:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Dynamically growing an array using realloc() is error prone and boring.</p></div> +<div class="paragraph"><p>Define your array with:</p></div> +<div class="ulist"><ul> <li> <p> a pointer (<tt>ary</tt>) that points at the array, initialized to <tt>NULL</tt>; @@ -332,7 +409,7 @@ </p> </li> </ul></div> -<div class="para"><p>Then before adding <tt>n`th element to the array, call `ALLOC_GROW(ary, n, +<div class="paragraph"><p>Then before adding <tt>n`th element to the array, call `ALLOC_GROW(ary, n, alloc)</tt>. This ensures that the array can hold at least <tt>n</tt> elements by calling <tt>realloc(3)</tt> and adjusting <tt>alloc</tt> variable.</p></div> <div class="listingblock"> @@ -349,12 +426,12 @@ ALLOC_GROW(ary, nr + 1, alloc); ary[nr++] = value you like;</tt></pre> </div></div> -<div class="para"><p>You are responsible for updating the <tt>nr</tt> variable.</p></div> +<div class="paragraph"><p>You are responsible for updating the <tt>nr</tt> variable.</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:09 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-builtin.html b/technical/api-builtin.html index 9ca7970..0fbbd8a 100644 --- a/technical/api-builtin.html +++ b/technical/api-builtin.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>builtin API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>builtin API</title> </head> <body> <div id="header"> @@ -311,9 +388,9 @@ </div> <h2 id="_adding_a_new_built_in">Adding a new built-in</h2> <div class="sectionbody"> -<div class="para"><p>There are 4 things to do to add a built-in command implementation to +<div class="paragraph"><p>There are 4 things to do to add a built-in command implementation to git:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> Define the implementation of the built-in command <tt>foo</tt> with @@ -338,9 +415,9 @@ <div class="content"> <pre><tt>{ "foo", cmd_foo, <options> },</tt></pre> </div></div> -<div class="para"><p>where options is the bitwise-or of:</p></div> -<div class="vlist"><dl> -<dt> +<div class="paragraph"><p>where options is the bitwise-or of:</p></div> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>RUN_SETUP</tt> </dt> <dd> @@ -351,7 +428,7 @@ done. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>USE_PAGER</tt> </dt> <dd> @@ -360,7 +437,7 @@ feed our output to it. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>NEED_WORK_TREE</tt> </dt> <dd> @@ -378,8 +455,8 @@ </p> </li> </ol></div> -<div class="para"><p>Additionally, if <tt>foo</tt> is a new command, there are 3 more things to do:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>Additionally, if <tt>foo</tt> is a new command, there are 3 more things to do:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> Add tests to <tt>t/</tt> directory. @@ -399,21 +476,21 @@ </div> <h2 id="_how_a_built_in_is_called">How a built-in is called</h2> <div class="sectionbody"> -<div class="para"><p>The implementation <tt>cmd_foo()</tt> takes three parameters, <tt>argc</tt>, <tt>argv, +<div class="paragraph"><p>The implementation <tt>cmd_foo()</tt> takes three parameters, <tt>argc</tt>, <tt>argv, and `prefix</tt>. The first two are similar to what <tt>main()</tt> of a standalone command would be called with.</p></div> -<div class="para"><p>When <tt>RUN_SETUP</tt> is specified in the <tt>commands[]</tt> table, and when you +<div class="paragraph"><p>When <tt>RUN_SETUP</tt> is specified in the <tt>commands[]</tt> table, and when you were started from a subdirectory of the work tree, <tt>cmd_foo()</tt> is called after chdir(2) to the top of the work tree, and <tt>prefix</tt> gets the path to the subdirectory the command started from. This allows you to convert a user-supplied pathname (typically relative to that directory) to a pathname relative to the top of the work tree.</p></div> -<div class="para"><p>The return value from <tt>cmd_foo()</tt> becomes the exit status of the +<div class="paragraph"><p>The return value from <tt>cmd_foo()</tt> becomes the exit status of the command.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:09 UTC +Last updated 2009-04-28 09:29:23 UTC </div> </div> </body> diff --git a/technical/api-decorate.html b/technical/api-decorate.html index ff2ba20..fc5ff10 100644 --- a/technical/api-decorate.html +++ b/technical/api-decorate.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>decorate API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>decorate API</title> </head> <body> <div id="header"> @@ -311,13 +388,13 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Talk about <decorate.h></p></div> -<div class="para"><p>(Linus)</p></div> +<div class="paragraph"><p>Talk about <decorate.h></p></div> +<div class="paragraph"><p>(Linus)</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:09 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-diff.html b/technical/api-diff.html index 0dd1cf1..243ffd7 100644 --- a/technical/api-diff.html +++ b/technical/api-diff.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>diff API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>diff API</title> </head> <body> <div id="header"> @@ -311,13 +388,13 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The diff API is for programs that compare two sets of files (e.g. two +<div class="paragraph"><p>The diff API is for programs that compare two sets of files (e.g. two trees, one tree and the index) and present the found difference in various ways. The calling program is responsible for feeding the API pairs of files, one from the "old" set and the corresponding one from "new" set, that are different. The library called through this API is called diffcore, and is responsible for two things.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> finding total rewrites (<tt>-B</tt>), renames (<tt>-M</tt>) and copies (<tt>-C</tt>), and @@ -335,7 +412,7 @@ </div> <h2 id="_calling_sequence">Calling sequence</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Prepare <tt>struct diff_options</tt> to record the set of diff options, and @@ -382,44 +459,44 @@ </div> <h2 id="_data_structures">Data structures</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct diff_filespec</tt> </p> </li> </ul></div> -<div class="para"><p>This is the internal representation for a single file (blob). It -records the blob object name (if known — for a work tree file it +<div class="paragraph"><p>This is the internal representation for a single file (blob). It +records the blob object name (if known — for a work tree file it typically is a NUL SHA-1), filemode and pathname. This is what the <tt>diff_addremove()</tt>, <tt>diff_change()</tt> and <tt>diff_unmerged()</tt> synthesize and feed <tt>diff_queue()</tt> function with.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct diff_filepair</tt> </p> </li> </ul></div> -<div class="para"><p>This records a pair of <tt>struct diff_filespec</tt>; the filespec for a file +<div class="paragraph"><p>This records a pair of <tt>struct diff_filespec</tt>; the filespec for a file in the "old" set (i.e. preimage) is called <tt>one</tt>, and the filespec for a file in the "new" set (i.e. postimage) is called <tt>two</tt>. A change that represents file creation has NULL in <tt>one</tt>, and file deletion has NULL in <tt>two</tt>.</p></div> -<div class="para"><p>A <tt>filepair</tt> starts pointing at <tt>one</tt> and <tt>two</tt> that are from the same +<div class="paragraph"><p>A <tt>filepair</tt> starts pointing at <tt>one</tt> and <tt>two</tt> that are from the same filename, but <tt>diffcore_std()</tt> can break pairs and match component filespecs with other filespecs from a different filepair to form new filepair. This is called <em>rename detection</em>.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct diff_queue</tt> </p> </li> </ul></div> -<div class="para"><p>This is a collection of filepairs. Notable members are:</p></div> -<div class="vlist"><dl> -<dt> +<div class="paragraph"><p>This is a collection of filepairs. Notable members are:</p></div> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>queue</tt> </dt> <dd> @@ -428,7 +505,7 @@ dynamically grows as you add filepairs; </p> </dd> -<dt> +<dt class="hdlist1"> <tt>alloc</tt> </dt> <dd> @@ -436,14 +513,14 @@ The allocated size of the <tt>queue</tt> array; </p> </dd> -<dt> +<dt class="hdlist1"> <tt>nr</tt> </dt> <dd> <p> The number of elements in the <tt>queue</tt> array. </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct diff_options</tt> @@ -452,11 +529,11 @@ </ul></div> </dd> </dl></div> -<div class="para"><p>This describes the set of options the calling program wants to affect +<div class="paragraph"><p>This describes the set of options the calling program wants to affect the operation of diffcore library with.</p></div> -<div class="para"><p>Notable members are:</p></div> -<div class="vlist"><dl> -<dt> +<div class="paragraph"><p>Notable members are:</p></div> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>output_format</tt> </dt> <dd> @@ -464,7 +541,7 @@ The output format used when <tt>diff_flush()</tt> is run. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>context</tt> </dt> <dd> @@ -472,7 +549,7 @@ Number of context lines to generate in patch output. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>break_opt</tt>, <tt>detect_rename</tt>, <tt>rename-score</tt>, <tt>rename_limit</tt> </dt> <dd> @@ -481,7 +558,7 @@ and copies. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>abbrev</tt> </dt> <dd> @@ -489,7 +566,7 @@ Number of hexdigits to abbreviate raw format output to. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>pickaxe</tt> </dt> <dd> @@ -500,7 +577,7 @@ in its preimage and postimage of the diff_queue. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>flags</tt> </dt> <dd> @@ -509,8 +586,8 @@ operation, but some do not have anything to do with the diffcore library. </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> BINARY, TEXT </dt> <dd> @@ -518,7 +595,7 @@ Affects the way how a file that is seemingly binary is treated. </p> </dd> -<dt> +<dt class="hdlist1"> FULL_INDEX </dt> <dd> @@ -527,7 +604,7 @@ names on the "index" lines. </p> </dd> -<dt> +<dt class="hdlist1"> FIND_COPIES_HARDER </dt> <dd> @@ -536,7 +613,7 @@ filepairs to allow copies from unmodified files be detected. </p> </dd> -<dt> +<dt class="hdlist1"> COLOR_DIFF </dt> <dd> @@ -544,7 +621,7 @@ Output should be colored. </p> </dd> -<dt> +<dt class="hdlist1"> COLOR_DIFF_WORDS </dt> <dd> @@ -552,7 +629,7 @@ Output is a colored word-diff. </p> </dd> -<dt> +<dt class="hdlist1"> NO_INDEX </dt> <dd> @@ -561,7 +638,7 @@ in random locations on the filesystem. </p> </dd> -<dt> +<dt class="hdlist1"> ALLOW_EXTERNAL </dt> <dd> @@ -570,7 +647,7 @@ output routine. Plumbing disables this to ensure stable output. </p> </dd> -<dt> +<dt class="hdlist1"> QUIET </dt> <dd> @@ -578,7 +655,7 @@ Do not show any output. </p> </dd> -<dt> +<dt class="hdlist1"> REVERSE_DIFF </dt> <dd> @@ -587,7 +664,7 @@ filepairs reversed; <tt>one</tt> is two, and <tt>two</tt> is one. </p> </dd> -<dt> +<dt class="hdlist1"> EXIT_WITH_STATUS </dt> <dd> @@ -597,7 +674,7 @@ difference using program exit code. </p> </dd> -<dt> +<dt class="hdlist1"> HAS_CHANGES </dt> <dd> @@ -605,7 +682,7 @@ Internal; used for optimization to see if there is any change. </p> </dd> -<dt> +<dt class="hdlist1"> SILENT_ON_REMOVE </dt> <dd> @@ -613,7 +690,7 @@ Affects if diff-files shows removed files. </p> </dd> -<dt> +<dt class="hdlist1"> RECURSIVE, TREE_IN_RECURSIVE </dt> <dd> @@ -626,11 +703,11 @@ </dl></div> </dd> </dl></div> -<div class="para"><p>(JC)</p></div> +<div class="paragraph"><p>(JC)</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:10 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-directory-listing.html b/technical/api-directory-listing.html index 46c19c5..cf6c25f 100644 --- a/technical/api-directory-listing.html +++ b/technical/api-directory-listing.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>directory listing API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>directory listing API</title> </head> <body> <div id="header"> @@ -311,18 +388,18 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The directory listing API is used to enumerate paths in the work tree, +<div class="paragraph"><p>The directory listing API is used to enumerate paths in the work tree, optionally taking <tt>.git/info/exclude</tt> and <tt>.gitignore</tt> files per directory into account.</p></div> </div> </div> <h2 id="_data_structure">Data structure</h2> <div class="sectionbody"> -<div class="para"><p><tt>struct dir_struct</tt> structure is used to pass directory traversal +<div class="paragraph"><p><tt>struct dir_struct</tt> structure is used to pass directory traversal options to the library and to record the paths discovered. The notable options are:</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>exclude_per_dir</tt> </dt> <dd> @@ -331,7 +408,7 @@ files (typically <tt>.gitignore</tt>). </p> </dd> -<dt> +<dt class="hdlist1"> <tt>collect_ignored</tt> </dt> <dd> @@ -339,7 +416,7 @@ Include paths that are to be excluded in the result. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>show_ignored</tt> </dt> <dd> @@ -348,7 +425,7 @@ files. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>show_other_directories</tt> </dt> <dd> @@ -356,7 +433,7 @@ Include a directory that is not tracked. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>hide_empty_directories</tt> </dt> <dd> @@ -364,7 +441,7 @@ Do not include a directory that is not tracked and is empty. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>no_gitlinks</tt> </dt> <dd> @@ -373,10 +450,10 @@ directory. Otherwise it is shown as a directory. </p> </dd> -<dt> +<dt class="hdlist1"> The result of the enumeration is left in these fields </dt> -<dt> +<dt class="hdlist1"> <tt>entries[]</tt> </dt> <dd> @@ -385,7 +462,7 @@ a path. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>nr</tt> </dt> <dd> @@ -393,7 +470,7 @@ The number of members in <tt>entries[]</tt> array. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>alloc</tt> </dt> <dd> @@ -405,9 +482,9 @@ </div> <h2 id="_calling_sequence">Calling sequence</h2> <div class="sectionbody"> -<div class="para"><p>Note: index may be looked at for .gitignore files that are CE_SKIP_WORKTREE +<div class="paragraph"><p>Note: index may be looked at for .gitignore files that are CE_SKIP_WORKTREE marked. If you to exclude files, make sure you have loaded index first.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Prepare <tt>struct dir_struct dir</tt> and clear it with <tt>memset(&dir, 0, @@ -439,11 +516,11 @@ </p> </li> </ul></div> -<div class="para"><p>(JC)</p></div> +<div class="paragraph"><p>(JC)</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:10 UTC +Last updated 2010-01-13 23:08:36 UTC </div> </div> </body> diff --git a/technical/api-gitattributes.html b/technical/api-gitattributes.html index 561ac56..94ba75d 100644 --- a/technical/api-gitattributes.html +++ b/technical/api-gitattributes.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>gitattributes API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>gitattributes API</title> </head> <body> <div id="header"> @@ -311,14 +388,14 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>gitattributes mechanism gives a uniform way to associate various +<div class="paragraph"><p>gitattributes mechanism gives a uniform way to associate various attributes to set of paths.</p></div> </div> </div> <h2 id="_data_structure">Data Structure</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>struct git_attr</tt> </dt> <dd> @@ -329,7 +406,7 @@ structure is of no interest to the calling programs. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>struct git_attr_check</tt> </dt> <dd> @@ -342,7 +419,7 @@ </div> <h2 id="_calling_sequence">Calling Sequence</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Prepare an array of <tt>struct git_attr_check</tt> to define the list of @@ -365,11 +442,11 @@ </div> <h2 id="_attribute_values">Attribute Values</h2> <div class="sectionbody"> -<div class="para"><p>An attribute for a path can be in one of four states: Set, Unset, +<div class="paragraph"><p>An attribute for a path can be in one of four states: Set, Unset, Unspecified or set to a string, and <tt>.value</tt> member of <tt>struct git_attr_check</tt> records it. There are three macros to check these:</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>ATTR_TRUE()</tt> </dt> <dd> @@ -377,7 +454,7 @@ Returns true if the attribute is Set for the path. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>ATTR_FALSE()</tt> </dt> <dd> @@ -385,7 +462,7 @@ Returns true if the attribute is Unset for the path. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>ATTR_UNSET()</tt> </dt> <dd> @@ -394,13 +471,13 @@ </p> </dd> </dl></div> -<div class="para"><p>If none of the above returns true, <tt>.value</tt> member points at a string +<div class="paragraph"><p>If none of the above returns true, <tt>.value</tt> member points at a string value of the attribute for the path.</p></div> </div> <h2 id="_example">Example</h2> <div class="sectionbody"> -<div class="para"><p>To see how attributes "crlf" and "indent" are set for different paths.</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>To see how attributes "crlf" and "indent" are set for different paths.</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> Prepare an array of <tt>struct git_attr_check</tt> with two elements (because @@ -420,7 +497,7 @@ check[1].attr = git_attr("ident", 5); }</tt></pre> </div></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> Call <tt>git_checkattr()</tt> with the prepared array of <tt>struct git_attr_check</tt>: @@ -434,7 +511,7 @@ setup_check(); git_checkattr(path, ARRAY_SIZE(check), check);</tt></pre> </div></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> Act on <tt>.value</tt> member of the result, left in <tt>check[]</tt>: @@ -461,11 +538,11 @@ ... }</tt></pre> </div></div> -<div class="para"><p>(JC)</p></div> +<div class="paragraph"><p>(JC)</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:10 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-grep.html b/technical/api-grep.html index d3135b5..201bd2e 100644 --- a/technical/api-grep.html +++ b/technical/api-grep.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>grep API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>grep API</title> </head> <body> <div id="header"> @@ -311,20 +388,20 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Talk about <grep.h>, things like:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Talk about <grep.h>, things like:</p></div> +<div class="ulist"><ul> <li> <p> grep_buffer() </p> </li> </ul></div> -<div class="para"><p>(JC)</p></div> +<div class="paragraph"><p>(JC)</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:11 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-hash.html b/technical/api-hash.html index aed89e7..6a220f3 100644 --- a/technical/api-hash.html +++ b/technical/api-hash.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>hash API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>hash API</title> </head> <body> <div id="header"> @@ -311,14 +388,14 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The hash API is a collection of simple hash table functions. Users are expected +<div class="paragraph"><p>The hash API is a collection of simple hash table functions. Users are expected to implement their own hashing.</p></div> </div> </div> <h2 id="_data_structures">Data Structures</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>struct hash_table</tt> </dt> <dd> @@ -329,13 +406,13 @@ valid entries. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>struct hash_table_entry</tt> </dt> <dd> <p> An opaque structure representing an entry in the hash table. The <tt>hash</tt> - member is the entry's hash key and the <tt>ptr</tt> member is the entry's + member is the entry’s hash key and the <tt>ptr</tt> member is the entry’s value. </p> </dd> @@ -343,8 +420,8 @@ </div> <h2 id="_functions">Functions</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>init_hash</tt> </dt> <dd> @@ -352,7 +429,7 @@ Initialize the hash table. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>free_hash</tt> </dt> <dd> @@ -360,33 +437,33 @@ Release memory associated with the hash table. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>insert_hash</tt> </dt> <dd> <p> Insert a pointer into the hash table. If an entry with that hash - already exists, a pointer to the existing entry's value is returned. + already exists, a pointer to the existing entry’s value is returned. Otherwise NULL is returned. This allows callers to implement chaining, etc. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>lookup_hash</tt> </dt> <dd> <p> Lookup an entry in the hash table. If an entry with that hash exists - the entry's value is returned. Otherwise NULL is returned. + the entry’s value is returned. Otherwise NULL is returned. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>for_each_hash</tt> </dt> <dd> <p> Call a function for each entry in the hash table. The function is - expected to take the entry's value as its only argument and return an + expected to take the entry’s value as its only argument and return an int. If the function returns a negative int the loop is aborted immediately. Otherwise, the return value is accumulated and the sum returned upon completion of the loop. @@ -396,7 +473,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:11 UTC +Last updated 2009-12-20 23:01:16 UTC </div> </div> </body> diff --git a/technical/api-history-graph.html b/technical/api-history-graph.html index 435684a..c3e7aad 100644 --- a/technical/api-history-graph.html +++ b/technical/api-history-graph.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>history graph API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>history graph API</title> </head> <body> <div id="header"> @@ -311,14 +388,14 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The graph API is used to draw a text-based representation of the commit +<div class="paragraph"><p>The graph API is used to draw a text-based representation of the commit history. The API generates the graph in a line-by-line fashion.</p></div> </div> </div> <h2 id="_functions">Functions</h2> <div class="sectionbody"> -<div class="para"><p>Core functions:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Core functions:</p></div> +<div class="ulist"><ul> <li> <p> <tt>graph_init()</tt> creates a new <tt>struct git_graph</tt> @@ -354,11 +431,11 @@ </p> </li> </ul></div> -<div class="para"><p>The following utility functions are wrappers around <tt>graph_next_line()</tt> and +<div class="paragraph"><p>The following utility functions are wrappers around <tt>graph_next_line()</tt> and <tt>graph_is_commit_finished()</tt>. They always print the output to stdout. They can all be called with a NULL graph argument, in which case no graph output will be printed.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>graph_show_commit()</tt> calls <tt>graph_next_line()</tt> until it returns non-zero. @@ -411,17 +488,17 @@ </div> <h2 id="_data_structure">Data structure</h2> <div class="sectionbody"> -<div class="para"><p><tt>struct git_graph</tt> is an opaque data type used to store the current graph +<div class="paragraph"><p><tt>struct git_graph</tt> is an opaque data type used to store the current graph state.</p></div> </div> <h2 id="_calling_sequence">Calling sequence</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Create a <tt>struct git_graph</tt> by calling <tt>graph_init()</tt>. When using the revision walking API, this is done automatically by <tt>setup_revisions()</tt> if - the <em>—graph</em> option is supplied. + the <em>--graph</em> option is supplied. </p> </li> <li> @@ -447,7 +524,7 @@ </div> <h2 id="_limitations">Limitations</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>graph_update()</tt> must be called with commits in topological order. It should @@ -462,7 +539,7 @@ on all parents of that commit. Parents must not be skipped, or the graph output will appear incorrect. </p> -<div class="para"><p><tt>graph_update()</tt> may be used on a pruned set of commits only if the parent list +<div class="paragraph"><p><tt>graph_update()</tt> may be used on a pruned set of commits only if the parent list has been rewritten so as to include only ancestors from the pruned set.</p></div> </li> <li> @@ -502,7 +579,7 @@ </div> <h2 id="_sample_output">Sample output</h2> <div class="sectionbody"> -<div class="para"><p>The following is an example of the output from the graph API. This output does +<div class="paragraph"><p>The following is an example of the output from the graph API. This output does not include any commit summary information—callers are responsible for outputting that information, if desired.</p></div> <div class="listingblock"> @@ -541,7 +618,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:11 UTC +Last updated 2009-11-23 06:10:40 UTC </div> </div> </body> diff --git a/technical/api-in-core-index.html b/technical/api-in-core-index.html index ec2c8b0..07fd211 100644 --- a/technical/api-in-core-index.html +++ b/technical/api-in-core-index.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>in-core index API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>in-core index API</title> </head> <body> <div id="header"> @@ -311,11 +388,11 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Talk about <read-cache.c> and <cache-tree.c>, things like:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Talk about <read-cache.c> and <cache-tree.c>, things like:</p></div> +<div class="ulist"><ul> <li> <p> -cache -> the_index macros +cache → the_index macros </p> </li> <li> @@ -380,12 +457,12 @@ </p> </li> </ul></div> -<div class="para"><p>(JC, Linus)</p></div> +<div class="paragraph"><p>(JC, Linus)</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:12 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-index.html b/technical/api-index.html index 93d6862..dd34a4b 100644 --- a/technical/api-index.html +++ b/technical/api-index.html
@@ -517,7 +517,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-11-18 00:52:24 UTC +Last updated 2011-01-31 05:00:42 UTC </div> </div> </body>
diff --git a/technical/api-lockfile.html b/technical/api-lockfile.html index bef29d7..62b7981 100644 --- a/technical/api-lockfile.html +++ b/technical/api-lockfile.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>lockfile API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>lockfile API</title> </head> <body> <div id="header"> @@ -311,8 +388,8 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The lockfile API serves two purposes:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>The lockfile API serves two purposes:</p></div> +<div class="ulist"><ul> <li> <p> Mutual exclusion. When we write out a new index file, first @@ -339,8 +416,8 @@ </div> <h2 id="_the_functions">The functions</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> hold_lock_file_for_update </dt> <dd> @@ -354,7 +431,7 @@ returns a negative integer to the caller on failure. </p> </dd> -<dt> +<dt class="hdlist1"> commit_lock_file </dt> <dd> @@ -366,7 +443,7 @@ value on failure to close(2) or rename(2). </p> </dd> -<dt> +<dt class="hdlist1"> rollback_lock_file </dt> <dd> @@ -376,7 +453,7 @@ close the file descriptor and remove the lockfile. </p> </dd> -<dt> +<dt class="hdlist1"> close_lock_file </dt> <dd> @@ -388,14 +465,14 @@ </p> </dd> </dl></div> -<div class="para"><p>Because the structure is used in an <tt>atexit(3)</tt> handler, its +<div class="paragraph"><p>Because the structure is used in an <tt>atexit(3)</tt> handler, its storage has to stay throughout the life of the program. It cannot be an auto variable allocated on the stack.</p></div> -<div class="para"><p>Call <tt>commit_lock_file()</tt> or <tt>rollback_lock_file()</tt> when you are +<div class="paragraph"><p>Call <tt>commit_lock_file()</tt> or <tt>rollback_lock_file()</tt> when you are done writing to the file descriptor. If you do not call either and simply <tt>exit(3)</tt> from the program, an <tt>atexit(3)</tt> handler will close and remove the lockfile.</p></div> -<div class="para"><p>If you need to close the file descriptor you obtained from +<div class="paragraph"><p>If you need to close the file descriptor you obtained from <tt>hold_lock_file_for_update</tt> function yourself, do so by calling <tt>close_lock_file()</tt>. You should never call <tt>close(2)</tt> yourself! Otherwise the <tt>struct @@ -409,7 +486,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:12 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-object-access.html b/technical/api-object-access.html index 709e7a4..a2e483b 100644 --- a/technical/api-object-access.html +++ b/technical/api-object-access.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>object access API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>object access API</title> </head> <body> <div id="header"> @@ -311,8 +388,8 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Talk about <sha1_file.c> and <object.h> family, things like</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Talk about <sha1_file.c> and <object.h> family, things like</p></div> +<div class="ulist"><ul> <li> <p> read_sha1_file() @@ -354,12 +431,12 @@ </p> </li> </ul></div> -<div class="para"><p>(JC, Shawn, Daniel, Dscho, Linus)</p></div> +<div class="paragraph"><p>(JC, Shawn, Daniel, Dscho, Linus)</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:12 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-quote.html b/technical/api-quote.html index e34d07a..dc715b0 100644 --- a/technical/api-quote.html +++ b/technical/api-quote.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>quote API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>quote API</title> </head> <body> <div id="header"> @@ -311,8 +388,8 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Talk about <quote.h>, things like</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Talk about <quote.h>, things like</p></div> +<div class="ulist"><ul> <li> <p> sq_quote and unquote @@ -329,12 +406,12 @@ </p> </li> </ul></div> -<div class="para"><p>(JC)</p></div> +<div class="paragraph"><p>(JC)</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:13 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-remote.html b/technical/api-remote.html index e6b2027..f709fa6 100644 --- a/technical/api-remote.html +++ b/technical/api-remote.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>Remotes configuration API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>Remotes configuration API</title> </head> <body> <div id="header"> @@ -311,7 +388,7 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The API in remote.h gives access to the configuration related to +<div class="paragraph"><p>The API in remote.h gives access to the configuration related to remotes. It handles all three configuration mechanisms historically and currently used by git, and presents the information in a uniform fashion. Note that the code also handles plain URLs without any @@ -320,16 +397,16 @@ </div> <h2 id="_struct_remote">struct remote</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>name</tt> </dt> <dd> <p> - The user's nickname for the remote + The user’s nickname for the remote </p> </dd> -<dt> +<dt class="hdlist1"> <tt>url</tt> </dt> <dd> @@ -337,7 +414,7 @@ An array of all of the url_nr URLs configured for the remote </p> </dd> -<dt> +<dt class="hdlist1"> <tt>pushurl</tt> </dt> <dd> @@ -345,7 +422,7 @@ An array of all of the pushurl_nr push URLs configured for the remote </p> </dd> -<dt> +<dt class="hdlist1"> <tt>push</tt> </dt> <dd> @@ -355,7 +432,7 @@ being the quantity. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>fetch</tt> </dt> <dd> @@ -365,7 +442,7 @@ being the quantity. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>fetch_tags</tt> </dt> <dd> @@ -377,7 +454,7 @@ tags. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>receivepack</tt>, <tt>uploadpack</tt> </dt> <dd> @@ -386,7 +463,7 @@ git-native protocols. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>http_proxy</tt> </dt> <dd> @@ -395,34 +472,34 @@ </p> </dd> </dl></div> -<div class="para"><p>struct remotes can be found by name with remote_get(), and iterated +<div class="paragraph"><p>struct remotes can be found by name with remote_get(), and iterated through with for_each_remote(). remote_get(NULL) will return the default remote, given the current branch and configuration.</p></div> </div> <h2 id="_struct_refspec">struct refspec</h2> <div class="sectionbody"> -<div class="para"><p>A struct refspec holds the parsed interpretation of a refspec. If it +<div class="paragraph"><p>A struct refspec holds the parsed interpretation of a refspec. If it will force updates (starts with a <em>+</em>), force is true. If it is a pattern (sides end with <em>*</em>) pattern is true. src and dest are the two sides (if a pattern, only the part outside of the wildcards); if there is only one side, it is src, and dst is NULL; if sides exist but are empty (i.e., the refspec either starts or ends with <em>:</em>), the corresponding side is "".</p></div> -<div class="para"><p>This parsing can be done to an array of strings to give an array of +<div class="paragraph"><p>This parsing can be done to an array of strings to give an array of struct refpsecs with parse_ref_spec().</p></div> -<div class="para"><p>remote_find_tracking(), given a remote and a struct refspec with +<div class="paragraph"><p>remote_find_tracking(), given a remote and a struct refspec with either src or dst filled out, will fill out the other such that the result is in the "fetch" specification for the remote (note that this evaluates patterns and returns a single result).</p></div> </div> <h2 id="_struct_branch">struct branch</h2> <div class="sectionbody"> -<div class="para"><p>Note that this may end up moving to branch.h</p></div> -<div class="para"><p>struct branch holds the configuration for a branch. It can be looked +<div class="paragraph"><p>Note that this may end up moving to branch.h</p></div> +<div class="paragraph"><p>struct branch holds the configuration for a branch. It can be looked branch_get(NULL) for HEAD.</p></div> -<div class="para"><p>It contains:</p></div> -<div class="vlist"><dl> -<dt> +<div class="paragraph"><p>It contains:</p></div> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>name</tt> </dt> <dd> @@ -430,7 +507,7 @@ The short name of the branch. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>refname</tt> </dt> <dd> @@ -438,7 +515,7 @@ The full path for the branch ref. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>remote_name</tt> </dt> <dd> @@ -446,7 +523,7 @@ The name of the remote listed in the configuration. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>remote</tt> </dt> <dd> @@ -454,7 +531,7 @@ The struct remote for that remote. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>merge_name</tt> </dt> <dd> @@ -462,17 +539,17 @@ An array of the "merge" lines in the configuration. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>merge</tt> </dt> <dd> <p> An array of the struct refspecs used for the merge lines. That - is, merge[i]->dst is a local tracking ref which should be + is, merge[i]→dst is a local tracking ref which should be merged into this branch by default. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>merge_nr</tt> </dt> <dd> @@ -481,18 +558,18 @@ </p> </dd> </dl></div> -<div class="para"><p>branch_has_merge_config() returns true if the given branch has merge +<div class="paragraph"><p>branch_has_merge_config() returns true if the given branch has merge configuration given.</p></div> </div> <h2 id="_other_stuff">Other stuff</h2> <div class="sectionbody"> -<div class="para"><p>There is other stuff in remote.h that is related, in general, to the +<div class="paragraph"><p>There is other stuff in remote.h that is related, in general, to the process of interacting with remotes.</p></div> -<div class="para"><p>(Daniel Barkalow)</p></div> +<div class="paragraph"><p>(Daniel Barkalow)</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:13 UTC +Last updated 2009-06-21 08:02:57 UTC </div> </div> </body> diff --git a/technical/api-revision-walking.html b/technical/api-revision-walking.html index 666b590..7f0aed2 100644 --- a/technical/api-revision-walking.html +++ b/technical/api-revision-walking.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>revision walking API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>revision walking API</title> </head> <body> <div id="header"> @@ -311,21 +388,21 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The revision walking API offers functions to build a list of revisions +<div class="paragraph"><p>The revision walking API offers functions to build a list of revisions and then iterate over that list.</p></div> </div> </div> <h2 id="_calling_sequence">Calling sequence</h2> <div class="sectionbody"> -<div class="para"><p>The walking API has a given calling sequence: first you need to +<div class="paragraph"><p>The walking API has a given calling sequence: first you need to initialize a rev_info structure, then add revisions to control what kind of revision list do you want to get, finally you can iterate over the revision list.</p></div> </div> <h2 id="_functions">Functions</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>init_revisions</tt> </dt> <dd> @@ -335,11 +412,11 @@ variable will be set to it. This is typically the first function you want to call when you want to deal with a revision list. After calling this function, you are free to customize options, like set - <tt>.ignore_merges</tt> to 0 if you don't want to ignore merges, and so on. See + <tt>.ignore_merges</tt> to 0 if you don’t want to ignore merges, and so on. See <tt>revision.h</tt> for a complete list of available options. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>add_pending_object</tt> </dt> <dd> @@ -360,19 +437,19 @@ </tr></table> </div> </dd> -<dt> +<dt class="hdlist1"> <tt>setup_revisions</tt> </dt> <dd> <p> Parse revision information, filling in the <tt>rev_info</tt> structure, and removing the used arguments from the argument list. Returns the number - of arguments left that weren't recognized, which are also moved to the + of arguments left that weren’t recognized, which are also moved to the head of the argument list. The last parameter is used in case no parameter given by the first two arguments. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>prepare_revision_walk</tt> </dt> <dd> @@ -382,7 +459,7 @@ start using get_revision() to do the iteration. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>get_revision</tt> </dt> <dd> @@ -396,8 +473,8 @@ </div> <h2 id="_data_structures">Data structures</h2> <div class="sectionbody"> -<div class="para"><p>Talk about <revision.h>, things like:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Talk about <revision.h>, things like:</p></div> +<div class="ulist"><ul> <li> <p> two diff_options, one for path limiting, another for output; @@ -409,11 +486,11 @@ </p> </li> </ul></div> -<div class="para"><p>(Linus, JC, Dscho)</p></div> +<div class="paragraph"><p>(Linus, JC, Dscho)</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:14 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-run-command.html b/technical/api-run-command.html index 5f87517..a378a84 100644 --- a/technical/api-run-command.html +++ b/technical/api-run-command.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>run-command API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>run-command API</title> </head> <body> <div id="header"> @@ -311,18 +388,18 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The run-command API offers a versatile tool to run sub-processes with +<div class="paragraph"><p>The run-command API offers a versatile tool to run sub-processes with redirected input and output as well as with a modified environment and an alternate current directory.</p></div> -<div class="para"><p>A similar API offers the capability to run a function asynchronously, +<div class="paragraph"><p>A similar API offers the capability to run a function asynchronously, which is primarily used to capture the output that the function produces in the caller in order to process it.</p></div> </div> </div> <h2 id="_functions">Functions</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>start_command</tt> </dt> <dd> @@ -332,7 +409,7 @@ See below for details. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>finish_command</tt> </dt> <dd> @@ -341,7 +418,7 @@ start_command(). </p> </dd> -<dt> +<dt class="hdlist1"> <tt>run_command</tt> </dt> <dd> @@ -351,7 +428,7 @@ to a <tt>struct child_process</tt> that specifies the details. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>run_command_v_opt</tt>, <tt>run_command_v_opt_cd_env</tt> </dt> <dd> @@ -368,8 +445,8 @@ </p> </dd> </dl></div> -<div class="para"><p>The functions above do the following:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>The functions above do the following:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> If a system call failed, errno is set and -1 is returned. A diagnostic @@ -395,10 +472,10 @@ signal number - 128, ie. it is negative and so indicates an unusual condition; a diagnostic is printed. This return value can be passed to exit(2), which will report the same code to the parent process that a - POSIX shell's $? would report for a program that died from the signal. + POSIX shell’s $? would report for a program that died from the signal. </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>start_async</tt> </dt> <dd> @@ -408,7 +485,7 @@ for communication with the function. See below for details. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>finish_async</tt> </dt> <dd> @@ -417,7 +494,7 @@ started with start_async(). </p> </dd> -<dt> +<dt class="hdlist1"> <tt>run_hook</tt> </dt> <dd> @@ -442,17 +519,17 @@ </div> <h2 id="_data_structures">Data structures</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct child_process</tt> </p> </li> </ul></div> -<div class="para"><p>This describes the arguments, redirections, and environment of a +<div class="paragraph"><p>This describes the arguments, redirections, and environment of a command to run in a sub-process.</p></div> -<div class="para"><p>The caller:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>The caller:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> allocates and clears (memset(&chld, 0, sizeof(chld));) a @@ -485,13 +562,13 @@ </p> </li> </ol></div> -<div class="para"><p>The .argv member is set up as an array of string pointers (NULL +<div class="paragraph"><p>The .argv member is set up as an array of string pointers (NULL terminated), of which .argv[0] is the program name to run (usually without a path). If the command to run is a git command, set argv[0] to the command name without the <em>git-</em> prefix and set .git_cmd = 1.</p></div> -<div class="para"><p>The members .in, .out, .err are used to redirect stdin, stdout, +<div class="paragraph"><p>The members .in, .out, .err are used to redirect stdin, stdout, stderr as follows:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> Specify 0 to request no special redirection. No new file descriptor @@ -556,39 +633,39 @@ </div></div> </li> </ol></div> -<div class="para"><p>To modify the environment of the sub-process, specify an array of +<div class="paragraph"><p>To modify the environment of the sub-process, specify an array of string pointers (NULL terminated) in .env:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> If the string is of the form "VAR=value", i.e. it contains <em>=</em> - the variable is added to the child process's environment. + the variable is added to the child process’s environment. </p> </li> <li> <p> If the string does not contain <em>=</em>, it names an environment - variable that will be removed from the child process's environment. + variable that will be removed from the child process’s environment. </p> </li> </ol></div> -<div class="para"><p>To specify a new initial working directory for the sub-process, +<div class="paragraph"><p>To specify a new initial working directory for the sub-process, specify it in the .dir member.</p></div> -<div class="para"><p>If the program cannot be found, the functions return -1 and set +<div class="paragraph"><p>If the program cannot be found, the functions return -1 and set errno to ENOENT. Normally, an error message is printed, but if .silent_exec_failure is set to 1, no message is printed for this special error condition.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct async</tt> </p> </li> </ul></div> -<div class="para"><p>This describes a function to run asynchronously, whose purpose is +<div class="paragraph"><p>This describes a function to run asynchronously, whose purpose is to produce output that the caller reads.</p></div> -<div class="para"><p>The caller:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>The caller:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> allocates and clears (memset(&asy, 0, sizeof(asy));) a @@ -621,9 +698,9 @@ </p> </li> </ol></div> -<div class="para"><p>The members .in, .out are used to provide a set of fd's for +<div class="paragraph"><p>The members .in, .out are used to provide a set of fd’s for communication between the caller and the callee as follows:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> Specify 0 to have no file descriptor passed. The callee will @@ -669,12 +746,12 @@ </div></div> </li> </ol></div> -<div class="para"><p>The function pointer in .proc has the following signature:</p></div> +<div class="paragraph"><p>The function pointer in .proc has the following signature:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>int proc(int in, int out, void *data);</tt></pre> </div></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> in, out specifies a set of file descriptors to which the function @@ -698,21 +775,21 @@ </p> </li> </ol></div> -<div class="para"><p>There are serious restrictions on what the asynchronous function can do +<div class="paragraph"><p>There are serious restrictions on what the asynchronous function can do because this facility is implemented by a thread in the same address space on most platforms (when pthreads is available), but by a pipe to a forked process otherwise:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> -It cannot change the program's state (global variables, environment, +It cannot change the program’s state (global variables, environment, etc.) in a way that the caller notices; in other words, .in and .out are the only communication channels to the caller. </p> </li> <li> <p> -It must not change the program's state that the caller of the +It must not change the program’s state that the caller of the facility also uses. </p> </li> @@ -720,7 +797,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:15 UTC +Last updated 2010-06-21 15:23:38 UTC </div> </div> </body> diff --git a/technical/api-setup.html b/technical/api-setup.html index 9a92613..1cbc827 100644 --- a/technical/api-setup.html +++ b/technical/api-setup.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>setup API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>setup API</title> </head> <body> <div id="header"> @@ -311,8 +388,8 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Talk about</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Talk about</p></div> +<div class="ulist"><ul> <li> <p> setup_git_directory() @@ -344,12 +421,12 @@ </p> </li> </ul></div> -<div class="para"><p>(Dscho)</p></div> +<div class="paragraph"><p>(Dscho)</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:15 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/technical/api-strbuf.html b/technical/api-strbuf.html index d8890d3..cd63f6a 100644 --- a/technical/api-strbuf.html +++ b/technical/api-strbuf.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>strbuf API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>strbuf API</title> </head> <body> <div id="header"> @@ -311,26 +388,26 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>strbuf's are meant to be used with all the usual C string and memory -APIs. Given that the length of the buffer is known, it's often better to +<div class="paragraph"><p>strbuf’s are meant to be used with all the usual C string and memory +APIs. Given that the length of the buffer is known, it’s often better to use the mem* functions than a str* one (memchr vs. strchr e.g.). Though, one has to be careful about the fact that str* functions often stop on NULs and that strbufs may have embedded NULs.</p></div> -<div class="para"><p>An strbuf is NUL terminated for convenience, but no function in the +<div class="paragraph"><p>An strbuf is NUL terminated for convenience, but no function in the strbuf API actually relies on the string being free of NULs.</p></div> -<div class="para"><p>strbufs has some invariants that are very important to keep in mind:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>strbufs has some invariants that are very important to keep in mind:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> The <tt>buf</tt> member is never NULL, so it can be used in any usual C -string operations safely. strbuf's _have_ to be initialized either by +string operations safely. strbuf’s <em>have</em> to be initialized either by <tt>strbuf_init()</tt> or by <tt>= STRBUF_INIT</tt> before the invariants, though. </p> -<div class="para"><p>Do <strong>not</strong> assume anything on what <tt>buf</tt> really is (e.g. if it is +<div class="paragraph"><p>Do <strong>not</strong> assume anything on what <tt>buf</tt> really is (e.g. if it is allocated memory or not), use <tt>strbuf_detach()</tt> to unwrap a memory buffer from its strbuf shell in a safe way. That is the sole supported way. This will give you a malloced buffer that you can later <tt>free()</tt>.</p></div> -<div class="para"><p>However, it is totally safe to modify anything in the string pointed by +<div class="paragraph"><p>However, it is totally safe to modify anything in the string pointed by the <tt>buf</tt> member, between the indices <tt>0</tt> and <tt>len-1</tt> (inclusive).</p></div> </li> <li> @@ -351,13 +428,13 @@ </div> <div class="listingblock"> <div class="content"> -<pre><tt>strbuf_grow(sb, SOME_SIZE); <b>(1)</b> +<pre><tt>strbuf_grow(sb, SOME_SIZE); <b><1></b> strbuf_setlen(sb, sb->len + SOME_OTHER_SIZE);</tt></pre> </div></div> -<div class="colist"><ol> +<div class="colist arabic"><ol> <li> <p> -Here, the memory array starting at <tt>sb->buf</tt>, and of length +Here, the memory array starting at <tt>sb→buf</tt>, and of length <tt>strbuf_avail(sb)</tt> is all yours, and you can be sure that <tt>strbuf_avail(sb)</tt> is at least <tt>SOME_SIZE</tt>. </p> @@ -369,15 +446,15 @@ <td class="content"><tt>SOME_OTHER_SIZE</tt> must be smaller or equal to <tt>strbuf_avail(sb)</tt>.</td> </tr></table> </div> -<div class="para"><p>Doing so is safe, though if it has to be done in many places, adding the +<div class="paragraph"><p>Doing so is safe, though if it has to be done in many places, adding the missing API to the strbuf module is the way to go.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Warning</div> </td> -<td class="content">Do _not_ assume that the area that is yours is of size <tt>alloc -- 1</tt> even if it's true in the current implementation. Alloc is somehow a +<td class="content">Do <em>not</em> assume that the area that is yours is of size <tt>alloc +- 1</tt> even if it’s true in the current implementation. Alloc is somehow a "private" member that should not be messed with. Use <tt>strbuf_avail()</tt> instead.</td> </tr></table> @@ -390,26 +467,26 @@ </div> <h2 id="_data_structures">Data structures</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct strbuf</tt> </p> </li> </ul></div> -<div class="para"><p>This is the string buffer structure. The <tt>len</tt> member can be used to +<div class="paragraph"><p>This is the string buffer structure. The <tt>len</tt> member can be used to determine the current length of the string, and <tt>buf</tt> member provides access to the string itself.</p></div> </div> <h2 id="_functions">Functions</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Life cycle </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>strbuf_init</tt> </dt> <dd> @@ -418,7 +495,7 @@ number to allocate memory, in case you want to prevent further reallocs. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_release</tt> </dt> <dd> @@ -427,7 +504,7 @@ string buffer after using this function, unless you initialize it again. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_detach</tt> </dt> <dd> @@ -437,7 +514,7 @@ to release it with <tt>free(3)</tt> when you are done with it. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_attach</tt> </dt> <dd> @@ -445,12 +522,12 @@ Attach a string to a buffer. You should specify the string to attach, the current length of the string and the amount of allocated memory. The amount must be larger than the string length, because the string you - pass is supposed to be a NUL-terminated string. This string _must_ be + pass is supposed to be a NUL-terminated string. This string <em>must</em> be malloc()ed, and after attaching, the pointer cannot be relied upon anymore, and neither be free()d directly. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_swap</tt> </dt> <dd> @@ -464,8 +541,8 @@ <p> Related to the size of the buffer </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>strbuf_avail</tt> </dt> <dd> @@ -473,7 +550,7 @@ Determine the amount of allocated but unused memory. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_grow</tt> </dt> <dd> @@ -485,7 +562,7 @@ some cases. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_setlen</tt> </dt> <dd> @@ -497,7 +574,7 @@ with</em>. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_reset</tt> </dt> <dd> @@ -511,8 +588,8 @@ <p> Related to the contents of the buffer </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>strbuf_rtrim</tt> </dt> <dd> @@ -520,7 +597,7 @@ Strip whitespace from the end of a string. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_cmp</tt> </dt> <dd> @@ -544,13 +621,13 @@ <div class="title">Note</div> </td> <td class="content">All of the functions in this section will grow the buffer as necessary. -If they fail for some reason other than memory shortage and the buffer hadn't +If they fail for some reason other than memory shortage and the buffer hadn’t been allocated before (i.e. the <tt>struct strbuf</tt> was set to <tt>STRBUF_INIT</tt>), then they will free() it.</td> </tr></table> </div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>strbuf_addch</tt> </dt> <dd> @@ -558,7 +635,7 @@ Add a single character to the buffer. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_insert</tt> </dt> <dd> @@ -567,7 +644,7 @@ will be shifted, not overwritten. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_remove</tt> </dt> <dd> @@ -575,7 +652,7 @@ Remove given amount of data from a given position of the buffer. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_splice</tt> </dt> <dd> @@ -584,7 +661,7 @@ data. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_add</tt> </dt> <dd> @@ -592,7 +669,7 @@ Add data of given length to the buffer. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_addstr</tt> </dt> <dd> @@ -612,13 +689,13 @@ <div class="content"> <pre><tt>strbuf_add(..., s, strlen(s));</tt></pre> </div></div> -<div class="para"><p>Meaning that this is efficient to write things like:</p></div> +<div class="paragraph"><p>Meaning that this is efficient to write things like:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>strbuf_addstr(sb, "immediate string");</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_addbuf</tt> </dt> <dd> @@ -626,7 +703,7 @@ Copy the contents of an other buffer at the end of the current one. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_adddup</tt> </dt> <dd> @@ -635,7 +712,7 @@ end of the buffer. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_expand</tt> </dt> <dd> @@ -644,23 +721,23 @@ placeholders. To that end, it parses the string and calls the specified function for every percent sign found. </p> -<div class="para"><p>The callback function is given a pointer to the character after the <tt>%</tt> +<div class="paragraph"><p>The callback function is given a pointer to the character after the <tt>%</tt> and a pointer to the struct strbuf. It is expected to add the expanded version of the placeholder to the strbuf, e.g. to add a newline character if the letter <tt>n</tt> appears after a <tt>%</tt>. The function returns the length of the placeholder recognized and <tt>strbuf_expand()</tt> skips over it.</p></div> -<div class="para"><p>The format <tt>%%</tt> is automatically expanded to a single <tt>%</tt> as a quoting +<div class="paragraph"><p>The format <tt>%%</tt> is automatically expanded to a single <tt>%</tt> as a quoting mechanism; callers do not need to handle the <tt>%</tt> placeholder themselves, and the callback function will not be invoked for this placeholder.</p></div> -<div class="para"><p>All other characters (non-percent and not skipped ones) are copied +<div class="paragraph"><p>All other characters (non-percent and not skipped ones) are copied verbatim to the strbuf. If the callback returned zero, meaning that the placeholder is unknown, then the percent sign is copied, too.</p></div> -<div class="para"><p>In order to facilitate caching and to make it possible to give +<div class="paragraph"><p>In order to facilitate caching and to make it possible to give parameters to the callback, <tt>strbuf_expand()</tt> passes a context pointer, which can be used by the programmer of the callback as she sees fit.</p></div> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_expand_dict_cb</tt> </dt> <dd> @@ -671,7 +748,7 @@ terminated by an entry with placeholder set to NULL. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_addbuf_percentquote</tt> </dt> <dd> @@ -682,7 +759,7 @@ strbuf_expand or to the *printf family of functions. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_addf</tt> </dt> <dd> @@ -690,7 +767,7 @@ Add a formatted string to the buffer. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_fread</tt> </dt> <dd> @@ -709,7 +786,7 @@ </tr></table> </div> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_read</tt> </dt> <dd> @@ -718,7 +795,7 @@ used to give a hint about the file size, to avoid reallocs. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_read_file</tt> </dt> <dd> @@ -727,7 +804,7 @@ can be used to give a hint about the file size, to avoid reallocs. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_readlink</tt> </dt> <dd> @@ -736,7 +813,7 @@ argument can be used to give a hint about the size, to avoid reallocs. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>strbuf_getline</tt> </dt> <dd> @@ -745,7 +822,7 @@ terminator character, typically <tt><em>\n</em></tt>. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>stripspace</tt> </dt> <dd> @@ -754,23 +831,23 @@ comments are considered contents to be removed or not. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>launch_editor</tt> </dt> <dd> <p> Launch the user preferred editor to edit a file and fill the buffer - with the file's contents upon the user completing their editing. The + with the file’s contents upon the user completing their editing. The third argument can be used to set the environment which the editor is run in. If the buffer is NULL the editor is launched as usual but the - file's contents are not read into the buffer upon completion. + file’s contents are not read into the buffer upon completion. </p> </dd> </dl></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:15 UTC +Last updated 2010-01-21 00:41:31 UTC </div> </div> </body> diff --git a/technical/api-string-list.html b/technical/api-string-list.html index c4d008e..63060f0 100644 --- a/technical/api-string-list.html +++ b/technical/api-string-list.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>string-list API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>string-list API</title> </head> <body> <div id="header"> @@ -311,12 +388,12 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The string_list API offers a data structure and functions to handle sorted +<div class="paragraph"><p>The string_list API offers a data structure and functions to handle sorted and unsorted string lists.</p></div> -<div class="para"><p>The <em>string_list</em> struct used to be called <em>path_list</em>, but was renamed +<div class="paragraph"><p>The <em>string_list</em> struct used to be called <em>path_list</em>, but was renamed because it is not specific to paths.</p></div> -<div class="para"><p>The caller:</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>The caller:</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> Allocates and clears a <tt>struct string_list</tt> variable. @@ -329,7 +406,7 @@ when you add something like git_path("…"), since that function returns a static buffer that will change with the next call to git_path(). </p> -<div class="para"><p>If you need something advanced, you can manually malloc() the <tt>items</tt> +<div class="paragraph"><p>If you need something advanced, you can manually malloc() the <tt>items</tt> member (you need this if you add things later) and you should set the <tt>nr</tt> and <tt>alloc</tt> members in that case, too.</p></div> </li> @@ -357,7 +434,7 @@ </p> </li> </ol></div> -<div class="para"><p>Example:</p></div> +<div class="paragraph"><p>Example:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>struct string_list list; @@ -379,7 +456,7 @@ <tt>O(n^2)</tt>).</td> </tr></table> </div> -<div class="para"><p>+ +<div class="paragraph"><p>+ However, if you use the list to check if a certain string was added already, you should not do that (using unsorted_string_list_has_string()), because the complexity would be quadratic again (but with a worse factor).</p></div> @@ -387,13 +464,13 @@ </div> <h2 id="_functions">Functions</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> General ones (works with sorted and unsorted lists as well) </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>print_string_list</tt> </dt> <dd> @@ -403,7 +480,7 @@ string-pointer pairs of the string_list, each one in its own line. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>string_list_clear</tt> </dt> <dd> @@ -420,8 +497,8 @@ <p> Functions for sorted lists only </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>string_list_has_string</tt> </dt> <dd> @@ -429,7 +506,7 @@ Determine if the string_list has a given string or not. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>string_list_insert</tt> </dt> <dd> @@ -438,11 +515,11 @@ handy if you want to write something to the <tt>util</tt> pointer of the string_list_item containing the just added string. </p> -<div class="para"><p>Since this function uses xrealloc() (which die()s if it fails) if the +<div class="paragraph"><p>Since this function uses xrealloc() (which die()s if it fails) if the list needs to grow, it is safe not to check the pointer. I.e. you may -write <tt>string_list_insert(…)->util = …;</tt>.</p></div> +write <tt>string_list_insert(…)→util = …;</tt>.</p></div> </dd> -<dt> +<dt class="hdlist1"> <tt>string_list_lookup</tt> </dt> <dd> @@ -457,8 +534,8 @@ <p> Functions for unsorted lists only </p> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>string_list_append</tt> </dt> <dd> @@ -466,7 +543,7 @@ Append a new string to the end of the string_list. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>sort_string_list</tt> </dt> <dd> @@ -474,22 +551,22 @@ Make an unsorted list sorted. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>unsorted_string_list_has_string</tt> </dt> <dd> <p> - It's like <tt>string_list_has_string()</tt> but for unsorted lists. + It’s like <tt>string_list_has_string()</tt> but for unsorted lists. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>unsorted_string_list_lookup</tt> </dt> <dd> <p> - It's like <tt>string_list_lookup()</tt> but for unsorted lists. + It’s like <tt>string_list_lookup()</tt> but for unsorted lists. </p> -<div class="para"><p>The above two functions need to look through all items, as opposed to their +<div class="paragraph"><p>The above two functions need to look through all items, as opposed to their counterpart for sorted lists, which performs a binary search.</p></div> </dd> </dl></div> @@ -498,24 +575,24 @@ </div> <h2 id="_data_structures">Data structures</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct string_list_item</tt> </p> </li> </ul></div> -<div class="para"><p>Represents an item of the list. The <tt>string</tt> member is a pointer to the +<div class="paragraph"><p>Represents an item of the list. The <tt>string</tt> member is a pointer to the string, and you may use the <tt>util</tt> member for any purpose, if you want.</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>struct string_list</tt> </p> </li> </ul></div> -<div class="para"><p>Represents the list itself.</p></div> -<div class="olist"><ol> +<div class="paragraph"><p>Represents the list itself.</p></div> +<div class="olist arabic"><ol class="arabic"> <li> <p> The array of items are available via the <tt>items</tt> member. @@ -542,7 +619,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:15 UTC +Last updated 2010-07-01 00:08:13 UTC </div> </div> </body> diff --git a/technical/api-tree-walking.html b/technical/api-tree-walking.html index 57dc109..44b19cb 100644 --- a/technical/api-tree-walking.html +++ b/technical/api-tree-walking.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>tree walking API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>tree walking API</title> </head> <body> <div id="header"> @@ -311,13 +388,13 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>The tree walking API is used to traverse and inspect trees.</p></div> +<div class="paragraph"><p>The tree walking API is used to traverse and inspect trees.</p></div> </div> </div> <h2 id="_data_structures">Data Structures</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>struct name_entry</tt> </dt> <dd> @@ -326,7 +403,7 @@ mode. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>struct tree_desc</tt> </dt> <dd> @@ -334,7 +411,7 @@ A semi-opaque data structure used to maintain the current state of the walk. </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>buffer</tt> is a pointer into the memory representation of the tree. It always @@ -353,14 +430,14 @@ </li> </ul></div> </dd> -<dt> +<dt class="hdlist1"> <tt>struct traverse_info</tt> </dt> <dd> <p> A structure used to maintain the state of a traversal. </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>prev</tt> points to the traverse_info which was used to descend into the @@ -405,8 +482,8 @@ </div> <h2 id="_initializing">Initializing</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>init_tree_desc</tt> </dt> <dd> @@ -416,7 +493,7 @@ members of <tt>struct tree</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>fill_tree_descriptor</tt> </dt> <dd> @@ -426,7 +503,7 @@ identifier and NULL otherwise. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>setup_traverse_info</tt> </dt> <dd> @@ -441,8 +518,8 @@ </div> <h2 id="_walking">Walking</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>tree_entry</tt> </dt> <dd> @@ -452,17 +529,17 @@ commonly used in the test of a while loop. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>tree_entry_len</tt> </dt> <dd> <p> - Calculate the length of a tree entry's pathname. This utilizes the + Calculate the length of a tree entry’s pathname. This utilizes the memory structure of a tree entry to avoid the overhead of using a generic strlen(). </p> </dd> -<dt> +<dt class="hdlist1"> <tt>update_tree_entry</tt> </dt> <dd> @@ -471,25 +548,25 @@ with <tt>tree_entry_extract</tt> to inspect the current entry. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>tree_entry_extract</tt> </dt> <dd> <p> Decode the entry currently being visited (the one pointed to by - <tt>tree_desc's</tt> <tt>entry</tt> member) and return the sha1 of the entry. The - <tt>pathp</tt> and <tt>modep</tt> arguments are set to the entry's pathname and mode + <tt>tree_desc’s</tt> <tt>entry</tt> member) and return the sha1 of the entry. The + <tt>pathp</tt> and <tt>modep</tt> arguments are set to the entry’s pathname and mode respectively. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>get_tree_entry</tt> </dt> <dd> <p> Find an entry in a tree given a pathname and the sha1 of a tree to search. Returns 0 if the entry is found and -1 otherwise. The third - and fourth parameters are set to the entry's sha1 and mode + and fourth parameters are set to the entry’s sha1 and mode respectively. </p> </dd> @@ -497,8 +574,8 @@ </div> <h2 id="_traversing">Traversing</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> <tt>traverse_trees</tt> </dt> <dd> @@ -507,14 +584,14 @@ <tt>traverse_info</tt> is called once for each tree entry. </p> </dd> -<dt> +<dt class="hdlist1"> <tt>traverse_callback_t</tt> </dt> <dd> <p> The arguments passed to the traverse callback are as follows: </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <tt>n</tt> counts the number of trees being traversed. @@ -527,7 +604,7 @@ </li> <li> <p> -<tt>dirmask</tt> has its nth bit set if the nth tree's entry is a directory. +<tt>dirmask</tt> has its nth bit set if the nth tree’s entry is a directory. </p> </li> <li> @@ -541,12 +618,12 @@ </p> </li> </ul></div> -<div class="para"><p>Returning a negative value will terminate the traversal. Otherwise the +<div class="paragraph"><p>Returning a negative value will terminate the traversal. Otherwise the return value is treated as an update mask. If the nth bit is set the nth tree will be updated and if the bit is not set the nth tree entry will be the same in the next callback invocation.</p></div> </dd> -<dt> +<dt class="hdlist1"> <tt>make_traverse_path</tt> </dt> <dd> @@ -557,7 +634,7 @@ tree would be "bar/baz". </p> </dd> -<dt> +<dt class="hdlist1"> <tt>traverse_path_len</tt> </dt> <dd> @@ -571,12 +648,12 @@ </div> <h2 id="_authors">Authors</h2> <div class="sectionbody"> -<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds -<torvalds@linux-foundation.org></p></div> +<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> and Linus Torvalds +<<a href="mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org</a>></p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:15 UTC +Last updated 2010-08-22 07:24:51 UTC </div> </div> </body> diff --git a/technical/api-xdiff-interface.html b/technical/api-xdiff-interface.html index 502fac2..082e68c 100644 --- a/technical/api-xdiff-interface.html +++ b/technical/api-xdiff-interface.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>xdiff interface API</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -279,6 +347,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -291,8 +360,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -303,7 +381,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>xdiff interface API</title> </head> <body> <div id="header"> @@ -311,14 +388,14 @@ </div> <div id="preamble"> <div class="sectionbody"> -<div class="para"><p>Talk about our calling convention to xdiff library, including +<div class="paragraph"><p>Talk about our calling convention to xdiff library, including xdiff_emit_consume_fn.</p></div> -<div class="para"><p>(Dscho, JC)</p></div> +<div class="paragraph"><p>(Dscho, JC)</p></div> </div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:16 UTC +Last updated 2008-09-19 06:28:28 UTC </div> </div> </body> diff --git a/user-manual.html b/user-manual.html index c9c5df2..beecf4b 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User’s Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book" title="Git User’s Manual (for version 1.5.3 or newer)"><div class="titlepage"><div><div><h1 class="title"><a name="id456198"></a>Git User’s Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id456124"></a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface"><div class="titlepage"><div><div><h2 class="title"><a name="id456124"></a></h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User’s Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book" title="Git User’s Manual (for version 1.5.3 or newer)"><div class="titlepage"><div><div><h1 class="title"><a name="id406910"></a>Git User’s Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id406836"></a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface"><div class="titlepage"><div><div><h2 class="title"><a name="id406836"></a></h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring git history">Chapter 2, <i>Exploring git history</i></a> explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for
